8318455: Fix the compiler/sharedstubs/SharedTrampolineTest.java and SharedStubToInterpTest.java

Reviewed-by: thartmann, shade, eastigeevich
This commit is contained in:
Evgeny Nikitin 2023-10-24 09:16:10 +00:00 committed by Tobias Hartmann
parent a644670cc6
commit 4a16d111b1
3 changed files with 7 additions and 6 deletions

@ -73,8 +73,6 @@ compiler/vectorapi/VectorLogicalOpIdentityTest.java 8302459 linux-x64,windows-x6
compiler/jvmci/TestUncaughtErrorInCompileMethod.java 8309073 generic-all
compiler/sharedstubs/SharedTrampolineTest.java 8318455 generic-all
compiler/codecache/CheckLargePages.java 8317831 linux-x64
#############################################################################

@ -51,9 +51,10 @@ import jdk.test.lib.process.ProcessTools;
public class SharedStubToInterpTest {
private final static int ITERATIONS_TO_HEAT_LOOP = 20_000;
private static void runTest(String test) throws Exception {
private static void runTest(String compiler, String test) throws Exception {
String testClassName = SharedStubToInterpTest.class.getName() + "$" + test;
ArrayList<String> command = new ArrayList<String>();
command.add(compiler);
command.add("-XX:+UnlockDiagnosticVMOptions");
command.add("-Xbatch");
command.add("-XX:+PrintRelocations");
@ -80,7 +81,7 @@ public class SharedStubToInterpTest {
public static void main(String[] args) throws Exception {
String[] methods = new String[] { "StaticMethodTest", "FinalClassTest", "FinalMethodTest"};
for (String methodName : methods) {
runTest(methodName);
runTest(args[0], methodName);
}
}

@ -28,6 +28,7 @@
* @bug 8280152
* @library /test/lib
*
* @requires vm.compiler2.enabled
* @requires vm.opt.TieredCompilation == null
* @requires os.arch=="aarch64" | os.arch=="riscv64"
* @requires vm.debug
@ -46,9 +47,10 @@ import jdk.test.lib.process.ProcessTools;
public class SharedTrampolineTest {
private final static int ITERATIONS_TO_HEAT_LOOP = 20_000;
private static void runTest(String test) throws Exception {
private static void runTest(String compiler, String test) throws Exception {
String testClassName = SharedTrampolineTest.class.getName() + "$" + test;
ArrayList<String> command = new ArrayList<String>();
command.add(compiler);
command.add("-XX:+UnlockDiagnosticVMOptions");
command.add("-Xbatch");
command.add("-XX:+PrintRelocations");
@ -72,7 +74,7 @@ public class SharedTrampolineTest {
public static void main(String[] args) throws Exception {
String[] tests = new String[] {"StaticMethodTest"};
for (String test : tests) {
runTest(test);
runTest(args[0], test);
}
}