test/compiler/codecache/dtrace/SegmentedCodeCacheDtraceTest.java

*** 25,37 ****
   * @test SegmentedCodeCacheDtraceTest
   * @bug 8015774
   * @summary testing of dtrace for segmented code cache
   * @requires os.family=="solaris"
   * @modules java.base/jdk.internal.misc
!  * @library /testlibrary /test/lib /
   *
!  * @build compiler.codecache.dtrace.SegmentedCodeCacheDtraceTest
   * @run driver ClassFileInstaller sun.hotspot.WhiteBox
   *                                sun.hotspot.WhiteBox$WhiteBoxPermission
   * @run main/othervm/timeout=600 -Xbootclasspath/a:.
   *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
   *     compiler.codecache.dtrace.SegmentedCodeCacheDtraceTest
--- 25,37 ----
   * @test SegmentedCodeCacheDtraceTest
   * @bug 8015774
   * @summary testing of dtrace for segmented code cache
   * @requires os.family=="solaris"
   * @modules java.base/jdk.internal.misc
!  * @library /test/lib /
   *
!  * @build sun.hotspot.WhiteBox
   * @run driver ClassFileInstaller sun.hotspot.WhiteBox
   *                                sun.hotspot.WhiteBox$WhiteBoxPermission
   * @run main/othervm/timeout=600 -Xbootclasspath/a:.
   *     -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
   *     compiler.codecache.dtrace.SegmentedCodeCacheDtraceTest
*** 40,53 ****
  package compiler.codecache.dtrace;
  
  import compiler.testlibrary.CompilerUtils;
  import jdk.test.lib.Asserts;
  import jdk.test.lib.JDKToolFinder;
! import jdk.test.lib.OutputAnalyzer;
  import jdk.test.lib.Utils;
- import jdk.test.lib.dtrace.DtraceResultsAnalyzer;
- import jdk.test.lib.dtrace.DtraceRunner;
  
  import java.io.IOException;
  import java.lang.reflect.Executable;
  import java.nio.file.Files;
  import java.nio.file.Paths;
--- 40,51 ----
  package compiler.codecache.dtrace;
  
  import compiler.testlibrary.CompilerUtils;
  import jdk.test.lib.Asserts;
  import jdk.test.lib.JDKToolFinder;
! import jdk.test.lib.process.OutputAnalyzer;
  import jdk.test.lib.Utils;
  
  import java.io.IOException;
  import java.lang.reflect.Executable;
  import java.nio.file.Files;
  import java.nio.file.Paths;