1.1 --- a/test/tools/javac/ProtectedInnerClass/ProtectedInnerClassesTest.java Thu Mar 14 01:45:44 2013 -0400
1.2 +++ b/test/tools/javac/ProtectedInnerClass/ProtectedInnerClassesTest.java Thu Mar 14 08:30:16 2013 +0000
1.3 @@ -91,7 +91,9 @@
1.4 //"${TESTJAVA}${FS}bin${FS}java" ${TESTVMOPTS} -classpath "${CLASSPATH}${PS}${TESTCLASSES}" p2.ProtectedInnerClass2
1.5 ToolBox.AnyToolArgs javaParams =
1.6 new ToolBox.AnyToolArgs()
1.7 - .setAllArgs(ToolBox.javaBinary, "-classpath", System.getProperty("user.dir"),
1.8 + .appendArgs(ToolBox.javaBinary)
1.9 + .appendArgs(ToolBox.testVMOpts)
1.10 + .appendArgs("-classpath", System.getProperty("user.dir"),
1.11 "p2.ProtectedInnerClass2");
1.12 ToolBox.executeCommand(javaParams);
1.13 }
1.14 @@ -101,14 +103,15 @@
1.15 //@run compile p1/ProtectedInnerClass1.java
1.16 ToolBox.JavaToolArgs javacParams =
1.17 new ToolBox.JavaToolArgs()
1.18 - .setOptions("-d", ".")
1.19 + .appendArgs("-d", ".")
1.20 .setSources(protectedInnerClass1Src);
1.21
1.22 ToolBox.javac(javacParams);
1.23
1.24 //@run compile/fail p2/ProtectedInnerClass3.java
1.25 - javacParams.setSources(protectedInnerClass3Src)
1.26 - .set(ToolBox.Expect.FAIL);
1.27 + javacParams = new ToolBox.JavaToolArgs(ToolBox.Expect.FAIL)
1.28 + .appendArgs("-d", ".")
1.29 + .setSources(protectedInnerClass3Src);
1.30 ToolBox.javac(javacParams);
1.31 }
1.32
