stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8268095: CDS MethodHandle tests should add -XX:-VerifyDependencies

Browse Source 
Reviewed-by: iklam, minqi
This commit is contained in:
Calvin Cheung 2021-06-03 22:56:57 +00:00
parent c1f3094f81
commit 516e60a7ee
14 changed files with 91 additions and 21 deletions

7
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/CDSMHTest_generate.sh

@ -79,6 +79,7 @@ do
import org.junit.Test;
import java.io.File;
import jdk.test.lib.Platform;
public class $i extends DynamicArchiveTestBase {
@Test
@ -96,6 +97,10 @@ public class $i extends DynamicArchiveTestBase {
static void testImpl() throws Exception {
String topArchiveName = getNewArchiveName();
String appJar = JarBuilder.build("MH", new File(classDir), null);
// Disable VerifyDpendencies when running with debug build because
// the test requires a lot more time to execute with the option enabled.
String verifyOpt =
Platform.isDebugBuild() ? "-XX:-VerifyDependencies" : "-showversion";
String[] classPaths = javaClassPath.split(File.pathSeparator);
String junitJar = null;
@ -107,7 +112,7 @@ public class $i extends DynamicArchiveTestBase {
}
dumpAndRun(topArchiveName, "-Xlog:cds,cds+dynamic=debug,class+load=trace",
"-cp", appJar + ps + junitJar,
"-cp", appJar + ps + junitJar, verifyOpt,
mainClass, testPackageName + "." + testClassName);
}
}

7
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesAsCollectorTest.java

@ -47,6 +47,7 @@
import org.junit.Test;
import java.io.File;
import jdk.test.lib.Platform;
public class MethodHandlesAsCollectorTest extends DynamicArchiveTestBase {
@Test
@ -64,6 +65,10 @@ public class MethodHandlesAsCollectorTest extends DynamicArchiveTestBase {
static void testImpl() throws Exception {
String topArchiveName = getNewArchiveName();
String appJar = JarBuilder.build("MH", new File(classDir), null);
// Disable VerifyDpendencies when running with debug build because
// the test requires a lot more time to execute with the option enabled.
String verifyOpt =
Platform.isDebugBuild() ? "-XX:-VerifyDependencies" : "-showversion";
String[] classPaths = javaClassPath.split(File.pathSeparator);
String junitJar = null;
@ -75,7 +80,7 @@ public class MethodHandlesAsCollectorTest extends DynamicArchiveTestBase {
}
dumpAndRun(topArchiveName, "-Xlog:cds,cds+dynamic=debug,class+load=trace",
"-cp", appJar + ps + junitJar,
"-cp", appJar + ps + junitJar, verifyOpt,
mainClass, testPackageName + "." + testClassName);
}
}

7
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesCastFailureTest.java

@ -47,6 +47,7 @@
import org.junit.Test;
import java.io.File;
import jdk.test.lib.Platform;
public class MethodHandlesCastFailureTest extends DynamicArchiveTestBase {
@Test
@ -64,6 +65,10 @@ public class MethodHandlesCastFailureTest extends DynamicArchiveTestBase {
static void testImpl() throws Exception {
String topArchiveName = getNewArchiveName();
String appJar = JarBuilder.build("MH", new File(classDir), null);
// Disable VerifyDpendencies when running with debug build because
// the test requires a lot more time to execute with the option enabled.
String verifyOpt =
Platform.isDebugBuild() ? "-XX:-VerifyDependencies" : "-showversion";
String[] classPaths = javaClassPath.split(File.pathSeparator);
String junitJar = null;
@ -75,7 +80,7 @@ public class MethodHandlesCastFailureTest extends DynamicArchiveTestBase {
}
dumpAndRun(topArchiveName, "-Xlog:cds,cds+dynamic=debug,class+load=trace",
"-cp", appJar + ps + junitJar,
"-cp", appJar + ps + junitJar, verifyOpt,
mainClass, testPackageName + "." + testClassName);
}
}

7
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesGeneralTest.java

@ -47,6 +47,7 @@
import org.junit.Test;
import java.io.File;
import jdk.test.lib.Platform;
public class MethodHandlesGeneralTest extends DynamicArchiveTestBase {
@Test
@ -64,6 +65,10 @@ public class MethodHandlesGeneralTest extends DynamicArchiveTestBase {
static void testImpl() throws Exception {
String topArchiveName = getNewArchiveName();
String appJar = JarBuilder.build("MH", new File(classDir), null);
// Disable VerifyDpendencies when running with debug build because
// the test requires a lot more time to execute with the option enabled.
String verifyOpt =
Platform.isDebugBuild() ? "-XX:-VerifyDependencies" : "-showversion";
String[] classPaths = javaClassPath.split(File.pathSeparator);
String junitJar = null;
@ -75,7 +80,7 @@ public class MethodHandlesGeneralTest extends DynamicArchiveTestBase {
}
dumpAndRun(topArchiveName, "-Xlog:cds,cds+dynamic=debug,class+load=trace",
"-cp", appJar + ps + junitJar,
"-cp", appJar + ps + junitJar, verifyOpt,
mainClass, testPackageName + "." + testClassName);
}
}

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

@ -47,6 +47,7 @@
import org.junit.Test;
import java.io.File;
import jdk.test.lib.Platform;
public class MethodHandlesInvokersTest extends DynamicArchiveTestBase {
@Test
@ -64,6 +65,10 @@ public class MethodHandlesInvokersTest extends DynamicArchiveTestBase {
static void testImpl() throws Exception {
String topArchiveName = getNewArchiveName();
String appJar = JarBuilder.build("MH", new File(classDir), null);
// Disable VerifyDpendencies when running with debug build because
// the test requires a lot more time to execute with the option enabled.
String verifyOpt =
Platform.isDebugBuild() ? "-XX:-VerifyDependencies" : "-showversion";
String[] classPaths = javaClassPath.split(File.pathSeparator);
String junitJar = null;
@ -75,7 +80,7 @@ public class MethodHandlesInvokersTest extends DynamicArchiveTestBase {
}
dumpAndRun(topArchiveName, "-Xlog:cds,cds+dynamic=debug,class+load=trace",
"-cp", appJar + ps + junitJar,
"-cp", appJar + ps + junitJar, verifyOpt,
mainClass, testPackageName + "." + testClassName);
}
}

7
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesPermuteArgumentsTest.java

@ -47,6 +47,7 @@
import org.junit.Test;
import java.io.File;
import jdk.test.lib.Platform;
public class MethodHandlesPermuteArgumentsTest extends DynamicArchiveTestBase {
@Test
@ -64,6 +65,10 @@ public class MethodHandlesPermuteArgumentsTest extends DynamicArchiveTestBase {
static void testImpl() throws Exception {
String topArchiveName = getNewArchiveName();
String appJar = JarBuilder.build("MH", new File(classDir), null);
// Disable VerifyDpendencies when running with debug build because
// the test requires a lot more time to execute with the option enabled.
String verifyOpt =
Platform.isDebugBuild() ? "-XX:-VerifyDependencies" : "-showversion";
String[] classPaths = javaClassPath.split(File.pathSeparator);
String junitJar = null;
@ -75,7 +80,7 @@ public class MethodHandlesPermuteArgumentsTest extends DynamicArchiveTestBase {
}
dumpAndRun(topArchiveName, "-Xlog:cds,cds+dynamic=debug,class+load=trace",
"-cp", appJar + ps + junitJar,
"-cp", appJar + ps + junitJar, verifyOpt,
mainClass, testPackageName + "." + testClassName);
}
}

7
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/methodHandles/MethodHandlesSpreadArgumentsTest.java

@ -47,6 +47,7 @@
import org.junit.Test;
import java.io.File;
import jdk.test.lib.Platform;
public class MethodHandlesSpreadArgumentsTest extends DynamicArchiveTestBase {
@Test
@ -64,6 +65,10 @@ public class MethodHandlesSpreadArgumentsTest extends DynamicArchiveTestBase {
static void testImpl() throws Exception {
String topArchiveName = getNewArchiveName();
String appJar = JarBuilder.build("MH", new File(classDir), null);
// Disable VerifyDpendencies when running with debug build because
// the test requires a lot more time to execute with the option enabled.
String verifyOpt =
Platform.isDebugBuild() ? "-XX:-VerifyDependencies" : "-showversion";
String[] classPaths = javaClassPath.split(File.pathSeparator);
String junitJar = null;
@ -75,7 +80,7 @@ public class MethodHandlesSpreadArgumentsTest extends DynamicArchiveTestBase {
}
dumpAndRun(topArchiveName, "-Xlog:cds,cds+dynamic=debug,class+load=trace",
"-cp", appJar + ps + junitJar,
"-cp", appJar + ps + junitJar, verifyOpt,
mainClass, testPackageName + "." + testClassName);
}
}

9
test/hotspot/jtreg/runtime/cds/appcds/methodHandles/CDSMHTest_generate.sh

@ -82,6 +82,7 @@ import java.io.File;
import jdk.test.lib.cds.CDSOptions;
import jdk.test.lib.cds.CDSTestUtils;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Platform;
public class $i {
@Test
@ -100,6 +101,10 @@ public class $i {
String appJar = JarBuilder.build("MH", new File(classDir), null);
String classList = testClassName + ".list";
String archiveName = testClassName + ".jsa";
// Disable VerifyDpendencies when running with debug build because
// the test requires a lot more time to execute with the option enabled.
String verifyOpt =
Platform.isDebugBuild() ? "-XX:-VerifyDependencies" : "-showversion";
String[] classPaths = javaClassPath.split(File.pathSeparator);
String junitJar = null;
@ -113,7 +118,7 @@ public class $i {
String jars = appJar + ps + junitJar;
// dump class list
CDSTestUtils.dumpClassList(classList, "-cp", jars, mainClass,
CDSTestUtils.dumpClassList(classList, "-cp", jars, verifyOpt, mainClass,
testPackageName + "." + testClassName);
// create archive with the class list
@ -126,7 +131,7 @@ public class $i {
// run with archive
CDSOptions runOpts = (new CDSOptions())
.addPrefix("-cp", jars, "-Xlog:class+load,cds=debug")
.addPrefix("-cp", jars, "-Xlog:class+load,cds=debug", verifyOpt)
.setArchiveName(archiveName)
.setUseVersion(false)
.addSuffix(mainClass, testPackageName + "." + testClassName);

9
test/hotspot/jtreg/runtime/cds/appcds/methodHandles/MethodHandlesAsCollectorTest.java

@ -50,6 +50,7 @@ import java.io.File;
import jdk.test.lib.cds.CDSOptions;
import jdk.test.lib.cds.CDSTestUtils;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Platform;
public class MethodHandlesAsCollectorTest {
@Test
@ -68,6 +69,10 @@ public class MethodHandlesAsCollectorTest {
String appJar = JarBuilder.build("MH", new File(classDir), null);
String classList = testClassName + ".list";
String archiveName = testClassName + ".jsa";
// Disable VerifyDpendencies when running with debug build because
// the test requires a lot more time to execute with the option enabled.
String verifyOpt =
Platform.isDebugBuild() ? "-XX:-VerifyDependencies" : "-showversion";
String[] classPaths = javaClassPath.split(File.pathSeparator);
String junitJar = null;
@ -81,7 +86,7 @@ public class MethodHandlesAsCollectorTest {
String jars = appJar + ps + junitJar;
// dump class list
CDSTestUtils.dumpClassList(classList, "-cp", jars, mainClass,
CDSTestUtils.dumpClassList(classList, "-cp", jars, verifyOpt, mainClass,
testPackageName + "." + testClassName);
// create archive with the class list
@ -94,7 +99,7 @@ public class MethodHandlesAsCollectorTest {
// run with archive
CDSOptions runOpts = (new CDSOptions())
.addPrefix("-cp", jars, "-Xlog:class+load,cds=debug")
.addPrefix("-cp", jars, "-Xlog:class+load,cds=debug", verifyOpt)
.setArchiveName(archiveName)
.setUseVersion(false)
.addSuffix(mainClass, testPackageName + "." + testClassName);

9
test/hotspot/jtreg/runtime/cds/appcds/methodHandles/MethodHandlesCastFailureTest.java

@ -50,6 +50,7 @@ import java.io.File;
import jdk.test.lib.cds.CDSOptions;
import jdk.test.lib.cds.CDSTestUtils;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Platform;
public class MethodHandlesCastFailureTest {
@Test
@ -68,6 +69,10 @@ public class MethodHandlesCastFailureTest {
String appJar = JarBuilder.build("MH", new File(classDir), null);
String classList = testClassName + ".list";
String archiveName = testClassName + ".jsa";
// Disable VerifyDpendencies when running with debug build because
// the test requires a lot more time to execute with the option enabled.
String verifyOpt =
Platform.isDebugBuild() ? "-XX:-VerifyDependencies" : "-showversion";
String[] classPaths = javaClassPath.split(File.pathSeparator);
String junitJar = null;
@ -81,7 +86,7 @@ public class MethodHandlesCastFailureTest {
String jars = appJar + ps + junitJar;
// dump class list
CDSTestUtils.dumpClassList(classList, "-cp", jars, mainClass,
CDSTestUtils.dumpClassList(classList, "-cp", jars, verifyOpt, mainClass,
testPackageName + "." + testClassName);
// create archive with the class list
@ -94,7 +99,7 @@ public class MethodHandlesCastFailureTest {
// run with archive
CDSOptions runOpts = (new CDSOptions())
.addPrefix("-cp", jars, "-Xlog:class+load,cds=debug")
.addPrefix("-cp", jars, "-Xlog:class+load,cds=debug", verifyOpt)
.setArchiveName(archiveName)
.setUseVersion(false)
.addSuffix(mainClass, testPackageName + "." + testClassName);

9
test/hotspot/jtreg/runtime/cds/appcds/methodHandles/MethodHandlesGeneralTest.java

@ -50,6 +50,7 @@ import java.io.File;
import jdk.test.lib.cds.CDSOptions;
import jdk.test.lib.cds.CDSTestUtils;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Platform;
public class MethodHandlesGeneralTest {
@Test
@ -68,6 +69,10 @@ public class MethodHandlesGeneralTest {
String appJar = JarBuilder.build("MH", new File(classDir), null);
String classList = testClassName + ".list";
String archiveName = testClassName + ".jsa";
// Disable VerifyDpendencies when running with debug build because
// the test requires a lot more time to execute with the option enabled.
String verifyOpt =
Platform.isDebugBuild() ? "-XX:-VerifyDependencies" : "-showversion";
String[] classPaths = javaClassPath.split(File.pathSeparator);
String junitJar = null;
@ -81,7 +86,7 @@ public class MethodHandlesGeneralTest {
String jars = appJar + ps + junitJar;
// dump class list
CDSTestUtils.dumpClassList(classList, "-cp", jars, mainClass,
CDSTestUtils.dumpClassList(classList, "-cp", jars, verifyOpt, mainClass,
testPackageName + "." + testClassName);
// create archive with the class list
@ -94,7 +99,7 @@ public class MethodHandlesGeneralTest {
// run with archive
CDSOptions runOpts = (new CDSOptions())
.addPrefix("-cp", jars, "-Xlog:class+load,cds=debug")
.addPrefix("-cp", jars, "-Xlog:class+load,cds=debug", verifyOpt)
.setArchiveName(archiveName)
.setUseVersion(false)
.addSuffix(mainClass, testPackageName + "." + testClassName);

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

@ -50,6 +50,7 @@ import java.io.File;
import jdk.test.lib.cds.CDSOptions;
import jdk.test.lib.cds.CDSTestUtils;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Platform;
public class MethodHandlesInvokersTest {
@Test
@ -68,6 +69,10 @@ public class MethodHandlesInvokersTest {
String appJar = JarBuilder.build("MH", new File(classDir), null);
String classList = testClassName + ".list";
String archiveName = testClassName + ".jsa";
// Disable VerifyDpendencies when running with debug build because
// the test requires a lot more time to execute with the option enabled.
String verifyOpt =
Platform.isDebugBuild() ? "-XX:-VerifyDependencies" : "-showversion";
String[] classPaths = javaClassPath.split(File.pathSeparator);
String junitJar = null;
@ -81,7 +86,7 @@ public class MethodHandlesInvokersTest {
String jars = appJar + ps + junitJar;
// dump class list
CDSTestUtils.dumpClassList(classList, "-cp", jars, mainClass,
CDSTestUtils.dumpClassList(classList, "-cp", jars, verifyOpt, mainClass,
testPackageName + "." + testClassName);
// create archive with the class list
@ -94,7 +99,7 @@ public class MethodHandlesInvokersTest {
// run with archive
CDSOptions runOpts = (new CDSOptions())
.addPrefix("-cp", jars, "-Xlog:class+load,cds=debug")
.addPrefix("-cp", jars, "-Xlog:class+load,cds=debug", verifyOpt)
.setArchiveName(archiveName)
.setUseVersion(false)
.addSuffix(mainClass, testPackageName + "." + testClassName);

9
test/hotspot/jtreg/runtime/cds/appcds/methodHandles/MethodHandlesPermuteArgumentsTest.java

@ -50,6 +50,7 @@ import java.io.File;
import jdk.test.lib.cds.CDSOptions;
import jdk.test.lib.cds.CDSTestUtils;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Platform;
public class MethodHandlesPermuteArgumentsTest {
@Test
@ -68,6 +69,10 @@ public class MethodHandlesPermuteArgumentsTest {
String appJar = JarBuilder.build("MH", new File(classDir), null);
String classList = testClassName + ".list";
String archiveName = testClassName + ".jsa";
// Disable VerifyDpendencies when running with debug build because
// the test requires a lot more time to execute with the option enabled.
String verifyOpt =
Platform.isDebugBuild() ? "-XX:-VerifyDependencies" : "-showversion";
String[] classPaths = javaClassPath.split(File.pathSeparator);
String junitJar = null;
@ -81,7 +86,7 @@ public class MethodHandlesPermuteArgumentsTest {
String jars = appJar + ps + junitJar;
// dump class list
CDSTestUtils.dumpClassList(classList, "-cp", jars, mainClass,
CDSTestUtils.dumpClassList(classList, "-cp", jars, verifyOpt, mainClass,
testPackageName + "." + testClassName);
// create archive with the class list
@ -94,7 +99,7 @@ public class MethodHandlesPermuteArgumentsTest {
// run with archive
CDSOptions runOpts = (new CDSOptions())
.addPrefix("-cp", jars, "-Xlog:class+load,cds=debug")
.addPrefix("-cp", jars, "-Xlog:class+load,cds=debug", verifyOpt)
.setArchiveName(archiveName)
.setUseVersion(false)
.addSuffix(mainClass, testPackageName + "." + testClassName);

9
test/hotspot/jtreg/runtime/cds/appcds/methodHandles/MethodHandlesSpreadArgumentsTest.java

@ -50,6 +50,7 @@ import java.io.File;
import jdk.test.lib.cds.CDSOptions;
import jdk.test.lib.cds.CDSTestUtils;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Platform;
public class MethodHandlesSpreadArgumentsTest {
@Test
@ -68,6 +69,10 @@ public class MethodHandlesSpreadArgumentsTest {
String appJar = JarBuilder.build("MH", new File(classDir), null);
String classList = testClassName + ".list";
String archiveName = testClassName + ".jsa";
// Disable VerifyDpendencies when running with debug build because
// the test requires a lot more time to execute with the option enabled.
String verifyOpt =
Platform.isDebugBuild() ? "-XX:-VerifyDependencies" : "-showversion";
String[] classPaths = javaClassPath.split(File.pathSeparator);
String junitJar = null;
@ -81,7 +86,7 @@ public class MethodHandlesSpreadArgumentsTest {
String jars = appJar + ps + junitJar;
// dump class list
CDSTestUtils.dumpClassList(classList, "-cp", jars, mainClass,
CDSTestUtils.dumpClassList(classList, "-cp", jars, verifyOpt, mainClass,
testPackageName + "." + testClassName);
// create archive with the class list
@ -94,7 +99,7 @@ public class MethodHandlesSpreadArgumentsTest {
// run with archive
CDSOptions runOpts = (new CDSOptions())
.addPrefix("-cp", jars, "-Xlog:class+load,cds=debug")
.addPrefix("-cp", jars, "-Xlog:class+load,cds=debug", verifyOpt)
.setArchiveName(archiveName)
.setUseVersion(false)
.addSuffix(mainClass, testPackageName + "." + testClassName);