changeset 353:67c75844461f

fix source argument for tests
author mali
date Fri, 20 Feb 2009 15:10:19 -0500
parents f73117585740
children e4d42305296e
files test/tools/javac/6341866/T6341866.java test/tools/javac/api/T6392782.java test/tools/javac/processing/6348499/T6348499.java test/tools/javac/processing/6414633/T6414633.java test/tools/javac/processing/6430209/T6430209.java test/tools/javac/processing/T6439826.java
diffstat 6 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/test/tools/javac/6341866/T6341866.java	Fri Feb 20 14:26:35 2009 -0500
+++ b/test/tools/javac/6341866/T6341866.java	Fri Feb 20 15:10:19 2009 -0500
@@ -97,7 +97,7 @@
         processorServices.delete();
 
         List<String> opts = new ArrayList<String>();
-        opts.addAll(Arrays.asList("-d", ".", "-sourcepath", testSrc, "-classpath", testClasses));
+        opts.addAll(Arrays.asList("-d", ".", "-sourcepath", testSrc, "-classpath", testClasses, "-source", "1.6"));
         if (implicitType.opt != null)
             opts.add(implicitType.opt);
 
--- a/test/tools/javac/api/T6392782.java	Fri Feb 20 14:26:35 2009 -0500
+++ b/test/tools/javac/api/T6392782.java	Fri Feb 20 15:10:19 2009 -0500
@@ -47,9 +47,9 @@
         check(scanner, 6, scanner.scan(trees, null));
 
         CountNodes nodeCounter = new CountNodes();
-        // 383 nodes with the regular parser; 384 nodes with EndPosParser
+        // 399 nodes with the regular parser; 400 nodes with EndPosParser
         // We automatically swith to EndPosParser when calling JavacTask.parse()
-        check(nodeCounter, 384, nodeCounter.scan(trees, null));
+        check(nodeCounter, 400, nodeCounter.scan(trees, null));
 
         CountIdentifiers idCounter = new CountIdentifiers();
         check(idCounter, 106, idCounter.scan(trees, null));
--- a/test/tools/javac/processing/6348499/T6348499.java	Fri Feb 20 14:26:35 2009 -0500
+++ b/test/tools/javac/processing/6348499/T6348499.java	Fri Feb 20 15:10:19 2009 -0500
@@ -54,6 +54,7 @@
             fm.getJavaFileObjectsFromFiles(Arrays.asList(new File(testSrc, "A.java")));
         Iterable<String> opts = Arrays.asList("-proc:only",
                                               "-processor", "A",
+                                              "-source", "1.6",
                                               "-processorpath", testClasses);
         StringWriter out = new StringWriter();
         JavacTask task = tool.getTask(out, fm, dl, opts, null, files);
--- a/test/tools/javac/processing/6414633/T6414633.java	Fri Feb 20 14:26:35 2009 -0500
+++ b/test/tools/javac/processing/6414633/T6414633.java	Fri Feb 20 15:10:19 2009 -0500
@@ -55,6 +55,7 @@
             fm.getJavaFileObjectsFromFiles(Arrays.asList(new File(testSrc, A.class.getName()+".java")));
         String[] opts = { "-proc:only",
                           "-processor", A.class.getName(),
+                          "-source", "1.6",
                           "-classpath", testClasses };
         JavacTask task = tool.getTask(null, fm, dl, Arrays.asList(opts), null, files);
         task.call();
--- a/test/tools/javac/processing/6430209/T6430209.java	Fri Feb 20 14:26:35 2009 -0500
+++ b/test/tools/javac/processing/6430209/T6430209.java	Fri Feb 20 15:10:19 2009 -0500
@@ -63,6 +63,7 @@
             new File(testSrc, "test0.java"), new File(testSrc, "test1.java")));
         Iterable<String> opts = Arrays.asList("-proc:only",
                                               "-processor", "b6341534",
+                                              "-source", "1.6",
                                               "-processorpath", testClasses);
         StringWriter out = new StringWriter();
         JavacTask task = tool.getTask(out, fm, dl, opts, null, files);
--- a/test/tools/javac/processing/T6439826.java	Fri Feb 20 14:26:35 2009 -0500
+++ b/test/tools/javac/processing/T6439826.java	Fri Feb 20 15:10:19 2009 -0500
@@ -49,7 +49,8 @@
         StandardJavaFileManager fm = tool.getStandardFileManager(dl, null, null);
         Iterable<? extends JavaFileObject> files =
             fm.getJavaFileObjectsFromFiles(Arrays.asList(new File(testSrc, T6439826.class.getName()+".java")));
-        Iterable<String> opts = Arrays.asList("-proc:only",
+        Iterable<String> opts = Arrays.asList("-source","1.6",
+                                              "-proc:only",
                                               "-processor", "T6439826",
                                               "-processorpath", testClasses);
         StringWriter out = new StringWriter();