From e291bfa501cc37e9344e86ceb21354dcf27a08f3 Mon Sep 17 00:00:00 2001
From: Amos Shi <ashi@openjdk.org>
Date: Fri, 16 Aug 2024 17:14:06 +0000
Subject: [PATCH] 8314837: 5 compiled/codecache tests ignore VM flags
Backport-of: 2a11bc41baec20cf670393ff29689043ed2d2114
---
.../jtreg/compiler/codecache/CheckCodeCacheInfo.java | 10 ++++------
.../compiler/codecache/CodeCacheFullCountTest.java | 3 ++-
.../codecache/cli/TestSegmentedCodeCacheOption.java | 1 +
.../cli/codeheapsize/TestCodeHeapSizeOptions.java | 1 +
.../cli/printcodecache/TestPrintCodeCacheOption.java | 1 +
5 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/test/hotspot/jtreg/compiler/codecache/CheckCodeCacheInfo.java b/test/hotspot/jtreg/compiler/codecache/CheckCodeCacheInfo.java
index 26f563788f8..03fae1c3890 100644
--- a/test/hotspot/jtreg/compiler/codecache/CheckCodeCacheInfo.java
+++ b/test/hotspot/jtreg/compiler/codecache/CheckCodeCacheInfo.java
@@ -28,9 +28,7 @@
* @library /test/lib
* @requires vm.debug
*
- * @run driver jdk.test.lib.helpers.ClassFileInstaller
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
- * compiler.codecache.CheckCodeCacheInfo
+ * @run driver compiler.codecache.CheckCodeCacheInfo
*/
package compiler.codecache;
@@ -69,9 +67,9 @@ public class CheckCodeCacheInfo {
public static void main(String[] args) throws Exception {
ProcessBuilder pb;
- pb = ProcessTools.createJavaProcessBuilder("-XX:+PrintCodeCache",
- "-XX:+Verbose",
- "-version");
+ pb = ProcessTools.createTestJvm("-XX:+PrintCodeCache",
+ "-XX:+Verbose",
+ "-version");
OutputAnalyzer out = new OutputAnalyzer(pb.start());
out.shouldHaveExitValue(0);
out.stdoutShouldMatch(VERBOSE_REGEXP);
diff --git a/test/hotspot/jtreg/compiler/codecache/CodeCacheFullCountTest.java b/test/hotspot/jtreg/compiler/codecache/CodeCacheFullCountTest.java
index 395e2bbdbfd..652d0b0b526 100644
--- a/test/hotspot/jtreg/compiler/codecache/CodeCacheFullCountTest.java
+++ b/test/hotspot/jtreg/compiler/codecache/CodeCacheFullCountTest.java
@@ -33,6 +33,7 @@ import jdk.test.lib.process.ProcessTools;
* @test
* @bug 8276036 8277213 8277441
* @summary test for the value of full_count in the message of insufficient codecache
+ * @requires vm.compMode != "Xint"
* @library /test/lib
*/
public class CodeCacheFullCountTest {
@@ -54,7 +55,7 @@ public class CodeCacheFullCountTest {
}
public static void runTest() throws Throwable {
- ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ ProcessBuilder pb = ProcessTools.createTestJvm(
"-XX:ReservedCodeCacheSize=2496k", "-XX:-UseCodeCacheFlushing", "CodeCacheFullCountTest", "WasteCodeCache");
OutputAnalyzer oa = ProcessTools.executeProcess(pb);
// Ignore adapter creation failures
diff --git a/test/hotspot/jtreg/compiler/codecache/cli/TestSegmentedCodeCacheOption.java b/test/hotspot/jtreg/compiler/codecache/cli/TestSegmentedCodeCacheOption.java
index 2a810abdd48..a5068b47454 100644
--- a/test/hotspot/jtreg/compiler/codecache/cli/TestSegmentedCodeCacheOption.java
+++ b/test/hotspot/jtreg/compiler/codecache/cli/TestSegmentedCodeCacheOption.java
@@ -25,6 +25,7 @@
* @test
* @bug 8015774
* @summary Verify SegmentedCodeCache option's processing
+ * @requires vm.flagless
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.compiler
diff --git a/test/hotspot/jtreg/compiler/codecache/cli/codeheapsize/TestCodeHeapSizeOptions.java b/test/hotspot/jtreg/compiler/codecache/cli/codeheapsize/TestCodeHeapSizeOptions.java
index 7ae62407ece..4d52f470645 100644
--- a/test/hotspot/jtreg/compiler/codecache/cli/codeheapsize/TestCodeHeapSizeOptions.java
+++ b/test/hotspot/jtreg/compiler/codecache/cli/codeheapsize/TestCodeHeapSizeOptions.java
@@ -26,6 +26,7 @@
* @key randomness
* @bug 8015774
* @summary Verify processing of options related to code heaps sizing.
+ * @requires vm.flagless
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.compiler
diff --git a/test/hotspot/jtreg/compiler/codecache/cli/printcodecache/TestPrintCodeCacheOption.java b/test/hotspot/jtreg/compiler/codecache/cli/printcodecache/TestPrintCodeCacheOption.java
index 223d683fc24..c0d826e59ec 100644
--- a/test/hotspot/jtreg/compiler/codecache/cli/printcodecache/TestPrintCodeCacheOption.java
+++ b/test/hotspot/jtreg/compiler/codecache/cli/printcodecache/TestPrintCodeCacheOption.java
@@ -25,6 +25,7 @@
* @test
* @bug 8015774
* @summary Verify that PrintCodeCache option print correct information.
+ * @requires vm.flagless
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.compiler
--
GitLab