--- a/test/jtreg-ext/requires/VMProps.java Fri Feb 16 12:18:09 2018 +0100
+++ b/test/jtreg-ext/requires/VMProps.java Thu Feb 15 11:39:42 2018 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -75,6 +75,7 @@
// vm.cds is true if the VM is compiled with cds support.
map.put("vm.cds", vmCDS());
map.put("vm.cds.custom.loaders", vmCDSForCustomLoaders());
+ map.put("vm.cds.archived.java.heap", vmCDSForArchivedJavaHeap());
// vm.graal.enabled is true if Graal is used as JIT
map.put("vm.graal.enabled", isGraalEnabled());
map.put("docker.support", dockerSupport());
@@ -300,7 +301,7 @@
/**
* Check for CDS support for custom loaders.
*
- * @return true if CDS is supported for customer loader by the VM to be tested.
+ * @return true if CDS provides support for customer loader in the VM to be tested.
*/
protected String vmCDSForCustomLoaders() {
if (vmCDS().equals("true") && Platform.areCustomLoadersSupportedForCDS()) {
@@ -311,6 +312,19 @@
}
/**
+ * Check for CDS support for archived Java heap regions.
+ *
+ * @return true if CDS provides support for archive Java heap regions in the VM to be tested.
+ */
+ protected String vmCDSForArchivedJavaHeap() {
+ if (vmCDS().equals("true") && WB.isJavaHeapArchiveSupported()) {
+ return "true";
+ } else {
+ return "false";
+ }
+ }
+
+ /**
* Check if Graal is used as JIT compiler.
*
* @return true if Graal is used as JIT compiler.