Skip to content

Commit a0c7f66

Browse files
committed
8349508: runtime/cds/appcds/TestParallelGCWithCDS.java should not check for specific output
Reviewed-by: dholmes, iklam
1 parent 1079147 commit a0c7f66

File tree

2 files changed

+3
-15
lines changed

2 files changed

+3
-15
lines changed

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2022, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -146,13 +146,6 @@ static void test(boolean dumpWithParallel, boolean execWithParallel, boolean use
146146
out.shouldContain(HELLO);
147147
out.shouldNotContain(errMsg);
148148
} else {
149-
String pattern = "((Too small maximum heap)" +
150-
"|(GC triggered before VM initialization completed)" +
151-
"|(CDS archive has aot-linked classes but the archived heap objects cannot be loaded)" +
152-
"|(Initial heap size set to a larger value than the maximum heap size)" +
153-
"|(java.lang.OutOfMemoryError)" +
154-
"|(Error: A JNI error has occurred, please check your installation and try again))";
155-
out.shouldMatch(pattern);
156149
out.shouldNotHaveFatalError();
157150
}
158151
n++;

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2021, 2025, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -163,12 +163,7 @@ static void test(boolean dumpWithSerial, boolean execWithSerial, boolean useSmal
163163
if (out.getExitValue() == 0) {
164164
out.shouldNotContain(errMsg);
165165
} else {
166-
String output = out.getStdout() + out.getStderr();
167-
String exp1 = "Too small maximum heap";
168-
String exp2 = "GC triggered before VM initialization completed";
169-
if (!output.contains(exp1) && !output.contains(exp2)) {
170-
throw new RuntimeException("Either '" + exp1 + "' or '" + exp2 + "' must be in stdout/stderr \n");
171-
}
166+
out.shouldNotHaveFatalError();
172167
}
173168
n++;
174169
}

0 commit comments

Comments
 (0)