langtools/test/tools/javac/platform/PlatformProviderTest.java

*** 95,108 ****
      void doTest(String platformSpec, String expectedParameter) {
          ToolBox tb = new ToolBox();
          Task.Result result =
                  new JavacTask(tb, Task.Mode.EXEC)
                    .outdir(".")
!                   .options("-J-classpath",
!                            "-J" + System.getProperty("test.classes"),
!                            "-J-XaddExports:jdk.compiler/com.sun.tools.javac.platform=ALL-UNNAMED",
!                            "-J-XaddExports:jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
                             "-XDrawDiagnostics",
                             "-release",
                             platformSpec,
                             System.getProperty("test.src") + "/PlatformProviderTestSource.java")
                    .run();
--- 95,107 ----
      void doTest(String platformSpec, String expectedParameter) {
          ToolBox tb = new ToolBox();
          Task.Result result =
                  new JavacTask(tb, Task.Mode.EXEC)
                    .outdir(".")
!                   .options("-J--class-path=" + System.getProperty("test.classes"),
!                            "-J--add-exports=jdk.compiler/com.sun.tools.javac.platform=ALL-UNNAMED",
!                            "-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
                             "-XDrawDiagnostics",
                             "-release",
                             platformSpec,
                             System.getProperty("test.src") + "/PlatformProviderTestSource.java")
                    .run();
*** 131,144 ****
      void doTestFailure() {
          ToolBox tb = new ToolBox();
          Task.Result result =
                  new JavacTask(tb, Task.Mode.EXEC)
                    .outdir(".")
!                   .options("-J-classpath",
!                            "-J" + System.getProperty("test.classes"),
!                            "-J-XaddExports:jdk.compiler/com.sun.tools.javac.platform=ALL-UNNAMED",
!                            "-J-XaddExports:jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
                             "-release",
                             "fail",
                             System.getProperty("test.src") + "/PlatformProviderTestSource.java")
                    .run(Task.Expect.FAIL);
  
--- 130,142 ----
      void doTestFailure() {
          ToolBox tb = new ToolBox();
          Task.Result result =
                  new JavacTask(tb, Task.Mode.EXEC)
                    .outdir(".")
!                   .options("-J--class-path=" + System.getProperty("test.classes"),
!                            "-J--add-exports=jdk.compiler/com.sun.tools.javac.platform=ALL-UNNAMED",
!                            "-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
                             "-release",
                             "fail",
                             System.getProperty("test.src") + "/PlatformProviderTestSource.java")
                    .run(Task.Expect.FAIL);