stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8292313: 2 runtime/cds/appcds tests fail after JDK-8284313

Browse Source 
Reviewed-by: hseigel, iklam
This commit is contained in:
Calvin Cheung 2022-08-16 16:26:59 +00:00
parent 3e122419b2
commit c3d3662e52
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/hotspot/jtreg/ProblemList.txt
View File

@ -102,9 +102,6 @@ applications/jcstress/copy.java 8229852 linux-all
containers/docker/TestJcmd.java 8278102 linux-all containers/docker/TestJcmd.java 8278102 linux-all
runtime/cds/appcds/WrongClasspath.java 8292313 generic-all
runtime/cds/appcds/dynamicArchive/WrongTopClasspath.java 8292313 generic-all
############################################################################# #############################################################################
# :hotspot_serviceability # :hotspot_serviceability

2
test/hotspot/jtreg/runtime/cds/appcds/WrongClasspath.java
View File

@ -75,7 +75,7 @@ public class WrongClasspath {
// message should be there. // message should be there.
output = TestCommon.execAuto( output = TestCommon.execAuto(
"-cp", jars, "Hello"); "-cp", jars, "Hello");
output.shouldMatch(".warning..cds. A jar file is not the one used while building the shared archive file:.*jar2.jar") output.shouldMatch("A jar file is not the one used while building the shared archive file:.*jar2.jar")
.shouldMatch(".warning..cds.*jar2.jar timestamp has changed."); .shouldMatch(".warning..cds.*jar2.jar timestamp has changed.");
} }
} }

4
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/WrongTopClasspath.java
View File

@ -83,7 +83,7 @@ public class WrongTopClasspath extends DynamicArchiveTestBase {
"assertShared:java.lang.Object", // base archive still useable "assertShared:java.lang.Object", // base archive still useable
"assertNotShared:GenericTestApp") // but top archive is not useable "assertNotShared:GenericTestApp") // but top archive is not useable
.assertNormalExit(topArchiveMsg, .assertNormalExit(topArchiveMsg,
"[warning][cds] shared class paths mismatch (hint: enable -Xlog:class+path=info to diagnose the failure)"); "shared class paths mismatch (hint: enable -Xlog:class+path=info to diagnose the failure)");
// modify the timestamp of appJar // modify the timestamp of appJar
(new File(appJar.toString())).setLastModified(System.currentTimeMillis() + 2000); (new File(appJar.toString())).setLastModified(System.currentTimeMillis() + 2000);
@ -97,7 +97,7 @@ public class WrongTopClasspath extends DynamicArchiveTestBase {
"assertNotShared:GenericTestApp") // but top archive is not useable "assertNotShared:GenericTestApp") // but top archive is not useable
.assertNormalExit(output -> { .assertNormalExit(output -> {
output.shouldContain(topArchiveMsg); output.shouldContain(topArchiveMsg);
output.shouldMatch(".warning..cds. A jar file is not the one used while building the shared archive file:.*GenericTestApp.jar"); output.shouldMatch("A jar file is not the one used while building the shared archive file:.*GenericTestApp.jar");
output.shouldMatch(".warning..cds.*GenericTestApp.jar timestamp has changed.");}); output.shouldMatch(".warning..cds.*GenericTestApp.jar timestamp has changed.");});
} }
} }