Skip to content

Commit 6398e46

Browse files
committed
8273522: Rename test property vm.cds.archived.java.heap to vm.cds.write.archived.java.heap
Reviewed-by: lucy Backport-of: 922e86f4ff28c7b17af8e7b5867a40fc76b7fdd7
1 parent 4ebd8b3 commit 6398e46

38 files changed

+48
-50
lines changed

src/hotspot/share/prims/whitebox.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1962,7 +1962,7 @@ WB_ENTRY(jboolean, WB_IsJVMCISupportedByGC(JNIEnv* env))
19621962
#endif
19631963
WB_END
19641964

1965-
WB_ENTRY(jboolean, WB_IsJavaHeapArchiveSupported(JNIEnv* env))
1965+
WB_ENTRY(jboolean, WB_CanWriteJavaHeapArchive(JNIEnv* env))
19661966
return HeapShared::is_heap_object_archiving_allowed();
19671967
WB_END
19681968

@@ -2585,7 +2585,7 @@ static JNINativeMethod methods[] = {
25852585
{CC"isDTraceIncluded", CC"()Z", (void*)&WB_IsDTraceIncluded },
25862586
{CC"isC2OrJVMCIIncluded", CC"()Z", (void*)&WB_isC2OrJVMCIIncluded },
25872587
{CC"isJVMCISupportedByGC", CC"()Z", (void*)&WB_IsJVMCISupportedByGC},
2588-
{CC"isJavaHeapArchiveSupported", CC"()Z", (void*)&WB_IsJavaHeapArchiveSupported },
2588+
{CC"canWriteJavaHeapArchive", CC"()Z", (void*)&WB_CanWriteJavaHeapArchive },
25892589
{CC"cdsMemoryMappingFailed", CC"()Z", (void*)&WB_CDSMemoryMappingFailed },
25902590

25912591
{CC"clearInlineCaches0", CC"(Z)V", (void*)&WB_ClearInlineCaches },

test/hotspot/jtreg/TEST.ROOT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ requires.properties= \
6868
vm.rtm.compiler \
6969
vm.cds \
7070
vm.cds.custom.loaders \
71-
vm.cds.archived.java.heap \
71+
vm.cds.write.archived.java.heap \
7272
vm.jvmti \
7373
vm.graal.enabled \
7474
vm.compiler1.enabled \

test/hotspot/jtreg/runtime/cds/SharedStrings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
* @test
2626
* @summary Check to make sure that shared strings in the bootstrap CDS archive
2727
* are actually shared
28-
* @requires vm.cds.archived.java.heap
28+
* @requires vm.cds.write.archived.java.heap
2929
* @library /test/lib
3030
* @build SharedStringsWb jdk.test.whitebox.WhiteBox
3131
* @run driver jdk.test.lib.helpers.ClassFileInstaller -jar whitebox.jar jdk.test.whitebox.WhiteBox

test/hotspot/jtreg/runtime/cds/SharedStringsDedup.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
/**
2525
* @test SharedStringsDedup
2626
* @summary Test -Xshare:auto with shared strings and -XX:+UseStringDeduplication
27-
* @requires vm.cds.archived.java.heap
27+
* @requires vm.cds.write.archived.java.heap
2828
* @library /test/lib
2929
* @run driver SharedStringsDedup
3030
*/

test/hotspot/jtreg/runtime/cds/SharedStringsRunAuto.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
/**
2525
* @test SharedStringsAuto
2626
* @summary Test -Xshare:auto with shared strings.
27-
* @requires vm.cds.archived.java.heap
27+
* @requires vm.cds.write.archived.java.heap
2828
* @library /test/lib
2929
* @run driver SharedStringsRunAuto
3030
*/

test/hotspot/jtreg/runtime/cds/appcds/CommandLineFlagCombo.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
/*
2626
* @test CommandLineFlagCombo
27-
* @requires vm.cds.archived.java.heap
27+
* @requires vm.cds.write.archived.java.heap
2828
* @comment This test explicitly chooses the type of GC to be used by sub-processes. It may conflict with the GC type set
2929
* via the -vmoptions command line option of JTREG. vm.gc==null will help the test case to discard the explicitly passed
3030
* vm options.

test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedIntegerCacheTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/*
2626
* @test
2727
* @summary Test primitive box caches integrity in various scenarios (IntegerCache etc)
28-
* @requires vm.cds.archived.java.heap
28+
* @requires vm.cds.write.archived.java.heap
2929
* @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/cds/appcds
3030
* @build jdk.test.whitebox.WhiteBox
3131
* @compile CheckIntegerCacheApp.java

test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedModuleComboTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/*
2626
* @test
2727
* @summary Test archived system module sub-graph and verify objects are archived.
28-
* @requires vm.cds.archived.java.heap
28+
* @requires vm.cds.write.archived.java.heap
2929
* @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/cds/appcds
3030
* @build jdk.test.whitebox.WhiteBox
3131
* @compile CheckArchivedModuleApp.java

test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedModuleCompareTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
/*
2626
* @test
2727
* @summary Compare archived system modules with non-archived.
28-
* @requires vm.cds.archived.java.heap
28+
* @requires vm.cds.write.archived.java.heap
2929
* @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/cds/appcds
3030
* @compile PrintSystemModulesApp.java
3131
* @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar PrintSystemModulesApp

test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedModuleWithCustomImageTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
/*
2525
* @test
2626
* @summary Test archived module graph with custom runtime image
27-
* @requires vm.cds.archived.java.heap
27+
* @requires vm.cds.write.archived.java.heap
2828
* @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/cds/appcds
2929
* @build jdk.test.whitebox.WhiteBox
3030
* @compile CheckArchivedModuleApp.java

0 commit comments

Comments
 (0)