test/compiler/jvmci/events/JvmciShutdownEventTest.java

*** 23,42 ****
  
  /*
   * @test
   * @bug 8136421
   * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
!  * @library /testlibrary /
   * @modules java.base/jdk.internal.misc
   * @modules jdk.vm.ci/jdk.vm.ci.hotspot
   *          jdk.vm.ci/jdk.vm.ci.code
   *          jdk.vm.ci/jdk.vm.ci.meta
   *          jdk.vm.ci/jdk.vm.ci.runtime
   *
   * @build compiler.jvmci.common.JVMCIHelpers
   *        compiler.jvmci.events.JvmciShutdownEventListener
-  *        compiler.jvmci.events.JvmciShutdownEventTest
   * @run driver jdk.test.lib.FileInstaller ../common/services/ ./META-INF/services/
   * @run driver jdk.test.lib.FileInstaller ./JvmciShutdownEventTest.config
   *     ./META-INF/services/jdk.vm.ci.hotspot.services.HotSpotVMEventListener
   * @run driver ClassFileInstaller
   *      compiler.jvmci.common.JVMCIHelpers$EmptyHotspotCompiler
--- 23,41 ----
  
  /*
   * @test
   * @bug 8136421
   * @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
!  * @library /test/lib /
   * @modules java.base/jdk.internal.misc
   * @modules jdk.vm.ci/jdk.vm.ci.hotspot
   *          jdk.vm.ci/jdk.vm.ci.code
   *          jdk.vm.ci/jdk.vm.ci.meta
   *          jdk.vm.ci/jdk.vm.ci.runtime
   *
   * @build compiler.jvmci.common.JVMCIHelpers
   *        compiler.jvmci.events.JvmciShutdownEventListener
   * @run driver jdk.test.lib.FileInstaller ../common/services/ ./META-INF/services/
   * @run driver jdk.test.lib.FileInstaller ./JvmciShutdownEventTest.config
   *     ./META-INF/services/jdk.vm.ci.hotspot.services.HotSpotVMEventListener
   * @run driver ClassFileInstaller
   *      compiler.jvmci.common.JVMCIHelpers$EmptyHotspotCompiler
*** 47,57 ****
   * @run main/othervm compiler.jvmci.events.JvmciShutdownEventTest
   */
  
  package compiler.jvmci.events;
  
! import jdk.test.lib.ExitCode;
  import jdk.test.lib.cli.CommandLineOptionTest;
  
  public class JvmciShutdownEventTest {
      private final static String[] MESSAGE = new String[]{
          JvmciShutdownEventListener.MESSAGE
--- 46,56 ----
   * @run main/othervm compiler.jvmci.events.JvmciShutdownEventTest
   */
  
  package compiler.jvmci.events;
  
! import jdk.test.lib.process.ExitCode;
  import jdk.test.lib.cli.CommandLineOptionTest;
  
  public class JvmciShutdownEventTest {
      private final static String[] MESSAGE = new String[]{
          JvmciShutdownEventListener.MESSAGE