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

8295294: Misc cleanups in runtime/InvocationTests

Browse Source 
Reviewed-by: dholmes
This commit is contained in:
Vladimir Ivanov 2022-10-14 17:46:11 +00:00
parent 0043d58c5d
commit 8487c56f7e
2 changed files with 27 additions and 33 deletions
test/hotspot/jtreg/runtime/InvocationTests/shared
AbstractGenerator.javaExecutorGenerator.java

58
test/hotspot/jtreg/runtime/InvocationTests/shared/AbstractGenerator.java

@ -121,50 +121,44 @@ public abstract class AbstractGenerator {
Class targetClass;
Checker checker;
System.out.printf(caseDescription);
try {
paramClass = loader.loadClass(calleeClassName);
targetClass = loader.loadClass(classNameC);
checker = getChecker(paramClass, targetClass);
if (executeTests) {
// Check runtime behavior
Caller caller = new Caller(loader, checker, paramClass, targetClass);
for (String site : callSites) {
String callResult = caller.call(site);
System.out.printf(" %7s", callResult);
if (!caller.isPassed()) {
String result = checker.check(loader.loadClass(site));
System.out.printf("/%s", Checker.abbreviateResult(result));
isPassed = false;
}
}
if (!caller.isPassed()) {
System.out.print(" | FAILED");
}
} else {
for (String site : callSites) {
String result = checker.check(loader.loadClass(site));
System.out.printf(" %7s", Checker.abbreviateResult(result));
}
}
} catch (Throwable e) {
String result = Checker.abbreviateResult(e.getClass().getName());
System.out.printf(caseDescription);
for (String site : callSites) {
System.out.printf(" %7s", result);
}
System.out.println("");
return true;
}
if (executeTests) {
// Check runtime behavior
Caller caller = new Caller(loader, checker, paramClass, targetClass);
boolean printedCaseDes = false;
for (String site : callSites) {
String callResult = caller.call(site);
if (!caller.isPassed()) {
isPassed = false;
if (!printedCaseDes) {
System.out.printf(caseDescription);
printedCaseDes = true;
}
System.out.printf(" %7s", callResult);
}
}
if (!caller.isPassed()) {
System.out.println(" | FAILED");
}
} else {
for (String site : callSites) {
String result = checker.check(loader.loadClass(site));
System.out.printf(" %7s", Checker.abbreviateResult(result));
}
}
System.out.println();
return isPassed;
}

2
test/hotspot/jtreg/runtime/InvocationTests/shared/ExecutorGenerator.java

@ -49,7 +49,7 @@ public class ExecutorGenerator {
}
public byte[] generateExecutor(String[] callSites) {
ClassWriter cw = new ClassWriter(COMPUTE_MAXS);
ClassWriter cw = new ClassWriter(COMPUTE_FRAMES | COMPUTE_MAXS);
cw.visit(Utils.version, ACC_PUBLIC | (Utils.isACC_SUPER ? ACC_SUPER : 0), className, null, "java/lang/Object", null);