test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesInvokersTest.java

*** 38,57 ****
   *        ../../../../../../../jdk/java/lang/invoke/MethodHandlesInvokersTest.java
   *        ../../../../../../../jdk/java/lang/invoke/remote/RemoteExample.java
   *        ../../../../../../../jdk/java/lang/invoke/common/test/java/lang/invoke/lib/CodeCacheOverflowProcessor.java
   *        ../test-classes/TestMHApp.java
   * @build sun.hotspot.WhiteBox
!  * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
   * @run junit/othervm/timeout=240 -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. MethodHandlesInvokersTest
   */
  
  import org.junit.Test;
  
  import java.io.File;
  
- import jtreg.SkippedException;
- 
  import sun.hotspot.gc.GC;
  
  public class MethodHandlesInvokersTest extends DynamicArchiveTestBase {
      @Test
      public void test() throws Exception {
--- 38,55 ----
   *        ../../../../../../../jdk/java/lang/invoke/MethodHandlesInvokersTest.java
   *        ../../../../../../../jdk/java/lang/invoke/remote/RemoteExample.java
   *        ../../../../../../../jdk/java/lang/invoke/common/test/java/lang/invoke/lib/CodeCacheOverflowProcessor.java
   *        ../test-classes/TestMHApp.java
   * @build sun.hotspot.WhiteBox
!  * @run driver ClassFileInstaller sun.hotspot.WhiteBox
   * @run junit/othervm/timeout=240 -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. MethodHandlesInvokersTest
   */
  
  import org.junit.Test;
  
  import java.io.File;
  
  import sun.hotspot.gc.GC;
  
  public class MethodHandlesInvokersTest extends DynamicArchiveTestBase {
      @Test
      public void test() throws Exception {
*** 62,72 ****
      private static final String mainClass = "TestMHApp";
      private static final String javaClassPath = System.getProperty("java.class.path");
      private static final String ps = System.getProperty("path.separator");
      private static final String testPackageName = "test.java.lang.invoke";
      private static final String testClassName = "MethodHandlesInvokersTest";
-     private static final String skippedException = "jtreg.SkippedException: Unable to map shared archive: test did not complete";
  
      static void testImpl() throws Exception {
          String topArchiveName = getNewArchiveName();
          JarBuilder.build("MH", new File(classDir), null);
          String appJar = classDir + File.separator + "MH.jar";
--- 60,69 ----