8249625: cleanup unused SkippedException in the tests under cds/appcd…

…s/dynamicArchive/methodHandles Reviewed-by: iklam
openjdk · Sep 8, 2020 · e20004d · e20004d · bridgekeeper · Sep 8, 2020
1 parent 63a5a12
commit e20004d
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 35 deletions.
diff --git a/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/CDSMHTest_generate.sh b/test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/CDSMHTest_generate.sh
@@ -80,10 +80,6 @@ import org.junit.Test;
 
 import java.io.File;
 
-import jtreg.SkippedException;
-
-import sun.hotspot.gc.GC;
-
 public class $i extends DynamicArchiveTestBase {
     @Test
     public void test() throws Exception {
@@ -96,7 +92,6 @@ public class $i extends DynamicArchiveTestBase {
     private static final String ps = System.getProperty("path.separator");
     private static final String testPackageName = "test.java.lang.invoke";
     private static final String testClassName = "$i";
-    private static final String skippedException = "jtreg.SkippedException: Unable to map shared archive: test did not complete";
 
     static void testImpl() throws Exception {
         String topArchiveName = getNewArchiveName();

diff --git a/...t/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesAsCollectorTest.java b/...t/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesAsCollectorTest.java
@@ -48,10 +48,6 @@
 
 import java.io.File;
 
-import jtreg.SkippedException;
-
-import sun.hotspot.gc.GC;
-
 public class MethodHandlesAsCollectorTest extends DynamicArchiveTestBase {
     @Test
     public void test() throws Exception {
@@ -64,7 +60,6 @@ public void test() throws Exception {
     private static final String ps = System.getProperty("path.separator");
     private static final String testPackageName = "test.java.lang.invoke";
     private static final String testClassName = "MethodHandlesAsCollectorTest";
-    private static final String skippedException = "jtreg.SkippedException: Unable to map shared archive: test did not complete";
 
     static void testImpl() throws Exception {
         String topArchiveName = getNewArchiveName();

diff --git a/...t/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesCastFailureTest.java b/...t/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesCastFailureTest.java
@@ -48,10 +48,6 @@
 
 import java.io.File;
 
-import jtreg.SkippedException;
-
-import sun.hotspot.gc.GC;
-
 public class MethodHandlesCastFailureTest extends DynamicArchiveTestBase {
     @Test
     public void test() throws Exception {
@@ -64,7 +60,6 @@ public void test() throws Exception {
     private static final String ps = System.getProperty("path.separator");
     private static final String testPackageName = "test.java.lang.invoke";
     private static final String testClassName = "MethodHandlesCastFailureTest";
-    private static final String skippedException = "jtreg.SkippedException: Unable to map shared archive: test did not complete";
 
     static void testImpl() throws Exception {
         String topArchiveName = getNewArchiveName();

diff --git a/...tspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesGeneralTest.java b/...tspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesGeneralTest.java
@@ -48,10 +48,6 @@
 
 import java.io.File;
 
-import jtreg.SkippedException;
-
-import sun.hotspot.gc.GC;
-
 public class MethodHandlesGeneralTest extends DynamicArchiveTestBase {
     @Test
     public void test() throws Exception {
@@ -64,7 +60,6 @@ public void test() throws Exception {
     private static final String ps = System.getProperty("path.separator");
     private static final String testPackageName = "test.java.lang.invoke";
     private static final String testClassName = "MethodHandlesGeneralTest";
-    private static final String skippedException = "jtreg.SkippedException: Unable to map shared archive: test did not complete";
 
     static void testImpl() throws Exception {
         String topArchiveName = getNewArchiveName();

diff --git a/...spot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesInvokersTest.java b/...spot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesInvokersTest.java
@@ -48,10 +48,6 @@
 
 import java.io.File;
 
-import jtreg.SkippedException;
-
-import sun.hotspot.gc.GC;
-
 public class MethodHandlesInvokersTest extends DynamicArchiveTestBase {
     @Test
     public void test() throws Exception {
@@ -64,7 +60,6 @@ public void test() throws Exception {
     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();

diff --git a/...eg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesPermuteArgumentsTest.java b/...eg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesPermuteArgumentsTest.java
@@ -48,10 +48,6 @@
 
 import java.io.File;
 
-import jtreg.SkippedException;
-
-import sun.hotspot.gc.GC;
-
 public class MethodHandlesPermuteArgumentsTest extends DynamicArchiveTestBase {
     @Test
     public void test() throws Exception {
@@ -64,7 +60,6 @@ public void test() throws Exception {
     private static final String ps = System.getProperty("path.separator");
     private static final String testPackageName = "test.java.lang.invoke";
     private static final String testClassName = "MethodHandlesPermuteArgumentsTest";
-    private static final String skippedException = "jtreg.SkippedException: Unable to map shared archive: test did not complete";
 
     static void testImpl() throws Exception {
         String topArchiveName = getNewArchiveName();

diff --git a/...reg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesSpreadArgumentsTest.java b/...reg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesSpreadArgumentsTest.java
@@ -48,10 +48,6 @@
 
 import java.io.File;
 
-import jtreg.SkippedException;
-
-import sun.hotspot.gc.GC;
-
 public class MethodHandlesSpreadArgumentsTest extends DynamicArchiveTestBase {
     @Test
     public void test() throws Exception {
@@ -64,7 +60,6 @@ public void test() throws Exception {
     private static final String ps = System.getProperty("path.separator");
     private static final String testPackageName = "test.java.lang.invoke";
     private static final String testClassName = "MethodHandlesSpreadArgumentsTest";
-    private static final String skippedException = "jtreg.SkippedException: Unable to map shared archive: test did not complete";
 
     static void testImpl() throws Exception {
         String topArchiveName = getNewArchiveName();