test/testlibrary_tests/ctw/JarDirTest.java

*** 22,39 ****
   */
  
  /*
   * @test
   * @bug 8012447
!  * @library /testlibrary /test/lib /testlibrary/ctw/src
   * @modules java.base/jdk.internal.jimage
   *          java.base/jdk.internal.misc
   *          java.base/jdk.internal.reflect
   *          java.compiler
   *          java.management
   *          jdk.jvmstat/sun.jvmstat.monitor
!  * @build ClassFileInstaller jdk.test.lib.* sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox Foo Bar
   * @run main ClassFileInstaller sun.hotspot.WhiteBox Foo Bar
   *                              sun.hotspot.WhiteBox$WhiteBoxPermission
   * @run main JarDirTest prepare
   * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Dsun.hotspot.tools.ctw.logfile=ctw.log sun.hotspot.tools.ctw.CompileTheWorld jars/*
   * @run main JarDirTest check ctw.log
--- 22,39 ----
   */
  
  /*
   * @test
   * @bug 8012447
!  * @library /test/lib /testlibrary/ctw/src
   * @modules java.base/jdk.internal.jimage
   *          java.base/jdk.internal.misc
   *          java.base/jdk.internal.reflect
   *          java.compiler
   *          java.management
   *          jdk.jvmstat/sun.jvmstat.monitor
!  * @build sun.hotspot.WhiteBox Foo Bar
   * @run main ClassFileInstaller sun.hotspot.WhiteBox Foo Bar
   *                              sun.hotspot.WhiteBox$WhiteBoxPermission
   * @run main JarDirTest prepare
   * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Dsun.hotspot.tools.ctw.logfile=ctw.log sun.hotspot.tools.ctw.CompileTheWorld jars/*
   * @run main JarDirTest check ctw.log
*** 43,53 ****
  
  import java.io.File;
  import java.nio.file.Files;
  import java.nio.file.Paths;
  
! import jdk.test.lib.OutputAnalyzer;
  
  public class JarDirTest extends CtwTest {
      private static final String[] SHOULD_CONTAIN
              = {"# jar_in_dir: jars",
                      "# jar: jars" + File.separator +"foo.jar",
--- 43,53 ----
  
  import java.io.File;
  import java.nio.file.Files;
  import java.nio.file.Paths;
  
! import jdk.test.lib.process.OutputAnalyzer;
  
  public class JarDirTest extends CtwTest {
      private static final String[] SHOULD_CONTAIN
              = {"# jar_in_dir: jars",
                      "# jar: jars" + File.separator +"foo.jar",