archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-18 18:14:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8210515: [TESTBUG]CheckArchivedModuleApp.java needs to check if EnableJVMCI is set

Browse source 
System module objects are not archived when EnableJVMCI is set to true.

Reviewed-by: iklam, ccheung
This commit is contained in:
Jiangli Zhou 2018-09-10 18:30:24 -04:00
parent 2702b5c299
commit 4baa5b10d1
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
test/hotspot/jtreg/ProblemList-graal.txt
View file

@ -147,9 +147,6 @@ vmTestbase/nsk/jvmti/StopThread/stopthrd007/TestDescription.java
vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t003/TestDescription.java 8051349 generic-all vmTestbase/nsk/jvmti/scenarios/sampling/SP02/sp02t003/TestDescription.java 8051349 generic-all
runtime/appcds/cacheObject/ArchivedModuleCompareTest.java 8209534 generic-all
runtime/appcds/cacheObject/ArchivedModuleComboTest.java 8209534 generic-all
serviceability/jvmti/FieldAccessWatch/FieldAccessWatch.java 8202482 generic-all serviceability/jvmti/FieldAccessWatch/FieldAccessWatch.java 8202482 generic-all
compiler/stable/TestStableBoolean.java 8204347 generic-all compiler/stable/TestStableBoolean.java 8204347 generic-all

8
test/hotspot/jtreg/runtime/appcds/cacheObject/CheckArchivedModuleApp.java
View file

@ -47,8 +47,16 @@ public class CheckArchivedModuleApp {
throw new RuntimeException( throw new RuntimeException(
"FAILED. Incorrect argument length: " + args.length); "FAILED. Incorrect argument length: " + args.length);
} }
boolean expectArchivedDescriptors = "yes".equals(args[0]); boolean expectArchivedDescriptors = "yes".equals(args[0]);
boolean expectArchivedConfiguration = "yes".equals(args[1]); boolean expectArchivedConfiguration = "yes".equals(args[1]);
// -XX:+EnableJVMCI adds extra system modules, in which case the system
// module objects are not archived.
if (wb.getBooleanVMFlag("EnableJVMCI")) {
expectArchivedDescriptors = false;
expectArchivedConfiguration = false;
}
checkModuleDescriptors(expectArchivedDescriptors); checkModuleDescriptors(expectArchivedDescriptors);
checkConfiguration(expectArchivedConfiguration); checkConfiguration(expectArchivedConfiguration);
checkEmptyConfiguration(expectArchivedConfiguration); checkEmptyConfiguration(expectArchivedConfiguration);