From 52d8c5d01a4f9c2c90e038fd1e9f5ad81deeb187 Mon Sep 17 00:00:00 2001 From: Calvin Cheung Date: Thu, 3 Oct 2024 04:50:37 +0000 Subject: [PATCH] 8341377: Update VMProps.isCDSRuntimeOptionsCompatible to include Parallel and Serial GC --- test/jtreg-ext/requires/VMProps.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/jtreg-ext/requires/VMProps.java b/test/jtreg-ext/requires/VMProps.java index 539a1f23208c3..257c4459eb37f 100644 --- a/test/jtreg-ext/requires/VMProps.java +++ b/test/jtreg-ext/requires/VMProps.java @@ -478,12 +478,14 @@ protected boolean isCDSRuntimeOptionsCompatible() { } String CCP_DISABLED = "-XX:-UseCompressedClassPointers"; String G1GC_ENABLED = "-XX:+UseG1GC"; + String PARALLELGC_ENABLED = "-XX:+UseParallelGC"; + String SERIALGC_ENABLED = "-XX:+UseSerialGC"; for (String opt : jtropts.split(",")) { if (opt.equals(CCP_DISABLED)) { return false; } if (opt.startsWith(GC_PREFIX) && opt.endsWith(GC_SUFFIX) && - !opt.equals(G1GC_ENABLED)) { + !opt.equals(G1GC_ENABLED) && !opt.equals(PARALLELGC_ENABLED) && !opt.equals(SERIALGC_ENABLED)) { return false; } }