8185436: jtreg: introduce @requires property to disable cds tests

Reviewed-by: jiangli, mseledtsov, iklam
This commit is contained in:
Goetz Lindenmaier 2017-08-01 16:03:06 +02:00
parent 11598ea67a
commit f399078a51
2 changed files with 16 additions and 0 deletions

View File

@ -71,6 +71,8 @@ public class VMProps implements Callable<Map<String, String>> {
map.put("vm.rtm.cpu", vmRTMCPU());
map.put("vm.rtm.os", vmRTMOS());
map.put("vm.aot", vmAOT());
// vm.cds is true if the VM is compiled with cds support.
map.put("vm.cds", vmCDS());
vmGC(map); // vm.gc.X = true/false
VMProps.dump(map);
@ -277,6 +279,19 @@ public class VMProps implements Callable<Map<String, String>> {
return "" + Files.exists(jaotc);
}
/**
* Check for CDS support.
*
* @return true if CDS is supported by the VM to be tested.
*/
protected String vmCDS() {
if (WB.isCDSIncludedInVmBuild()) {
return "true";
} else {
return "false";
}
}
/**
* Dumps the map to the file if the file name is given as the property.
* This functionality could be helpful to know context in the real

View File

@ -523,6 +523,7 @@ public class WhiteBox {
public native boolean isShared(Object o);
public native boolean isSharedClass(Class<?> c);
public native boolean areSharedStringsIgnored();
public native boolean isCDSIncludedInVmBuild();
// Compiler Directive
public native int addCompilerDirective(String compDirect);