8345347: Test runtime/cds/TestDefaultArchiveLoading.java should accept VM flags or be marked as flagless

Reviewed-by: lmesnik, stefank, ccheung
This commit is contained in:
Matias Saavedra Silva 2025-06-04 14:16:20 +00:00
parent ae1892fb0f
commit a2723d91df

View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2024, Red Hat, Inc. All rights reserved. * Copyright (c) 2024, Red Hat, Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
@ -26,6 +26,7 @@
* @test id=nocoops_nocoh * @test id=nocoops_nocoh
* @summary Test Loading of default archives in all configurations * @summary Test Loading of default archives in all configurations
* @requires vm.cds * @requires vm.cds
* @requires vm.cds.write.archived.java.heap
* @requires vm.bits == 64 * @requires vm.bits == 64
* @library /test/lib * @library /test/lib
* @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.misc
@ -37,6 +38,7 @@
* @test id=nocoops_coh * @test id=nocoops_coh
* @summary Test Loading of default archives in all configurations (requires --enable-cds-archive-coh) * @summary Test Loading of default archives in all configurations (requires --enable-cds-archive-coh)
* @requires vm.cds * @requires vm.cds
* @requires vm.cds.write.archived.java.heap
* @requires vm.bits == 64 * @requires vm.bits == 64
* @library /test/lib * @library /test/lib
* @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.misc
@ -48,6 +50,7 @@
* @test id=coops_nocoh * @test id=coops_nocoh
* @summary Test Loading of default archives in all configurations * @summary Test Loading of default archives in all configurations
* @requires vm.cds * @requires vm.cds
* @requires vm.cds.write.archived.java.heap
* @requires vm.bits == 64 * @requires vm.bits == 64
* @library /test/lib * @library /test/lib
* @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.misc
@ -59,6 +62,7 @@
* @test id=coops_coh * @test id=coops_coh
* @summary Test Loading of default archives in all configurations (requires --enable-cds-archive-coh) * @summary Test Loading of default archives in all configurations (requires --enable-cds-archive-coh)
* @requires vm.cds * @requires vm.cds
* @requires vm.cds.write.archived.java.heap
* @requires vm.bits == 64 * @requires vm.bits == 64
* @library /test/lib * @library /test/lib
* @modules java.base/jdk.internal.misc * @modules java.base/jdk.internal.misc
@ -131,7 +135,7 @@ public class TestDefaultArchiveLoading {
default: throw new RuntimeException("Invalid argument " + args[0]); default: throw new RuntimeException("Invalid argument " + args[0]);
} }
ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder( ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(
"-XX:" + coh + "UseCompactObjectHeaders", "-XX:" + coh + "UseCompactObjectHeaders",
"-XX:" + coops + "UseCompressedOops", "-XX:" + coops + "UseCompressedOops",
"-Xlog:cds", "-Xlog:cds",