From 8dbd6772f9b65ab1ae6ef683c7300092e4745951 Mon Sep 17 00:00:00 2001
From: Amos Shi <ashi@openjdk.org>
Date: Wed, 21 Aug 2024 23:25:56 +0000
Subject: [PATCH] 8315576: compiler/codecache/CodeCacheFullCountTest.java fails
after JDK-8314837
Reviewed-by: phh
Backport-of: 343cc0ce2bba797e206f6b7312018a8c6d1bdb66
---
.../codecache/CodeCacheFullCountTest.java | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/test/hotspot/jtreg/compiler/codecache/CodeCacheFullCountTest.java b/test/hotspot/jtreg/compiler/codecache/CodeCacheFullCountTest.java
index 652d0b0b526..ff28c588b4c 100644
--- a/test/hotspot/jtreg/compiler/codecache/CodeCacheFullCountTest.java
+++ b/test/hotspot/jtreg/compiler/codecache/CodeCacheFullCountTest.java
@@ -45,12 +45,20 @@ public class CodeCacheFullCountTest {
}
}
- public static void wasteCodeCache() throws Exception {
+ public static void wasteCodeCache() throws Throwable {
URL url = CodeCacheFullCountTest.class.getProtectionDomain().getCodeSource().getLocation();
- for (int i = 0; i < 500; i++) {
- ClassLoader cl = new MyClassLoader(url);
- refClass(cl.loadClass("SomeClass"));
+ try {
+ for (int i = 0; i < 500; i++) {
+ ClassLoader cl = new MyClassLoader(url);
+ refClass(cl.loadClass("SomeClass"));
+ }
+ } catch (Throwable t) {
+ // Expose the root cause of the Throwable instance.
+ while (t.getCause() != null) {
+ t = t.getCause();
+ }
+ throw t;
}
}
@@ -59,7 +67,7 @@ public class CodeCacheFullCountTest {
"-XX:ReservedCodeCacheSize=2496k", "-XX:-UseCodeCacheFlushing", "CodeCacheFullCountTest", "WasteCodeCache");
OutputAnalyzer oa = ProcessTools.executeProcess(pb);
// Ignore adapter creation failures
- if (oa.getExitValue() != 0 && !oa.getStderr().contains("Out of space in CodeCache for adapters")) {
+ if (oa.getExitValue() != 0 && !oa.getOutput().contains("Out of space in CodeCache for adapters")) {
oa.reportDiagnosticSummary();
throw new RuntimeException("VM finished with exit code " + oa.getExitValue());
}
--
GitLab