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

8272335: runtime/cds/appcds/MoveJDKTest.java doesn't check exit codes

Browse Source 
Reviewed-by: iklam
This commit is contained in:
Igor Ignatyev 2021-08-11 19:38:52 +00:00
parent 9ba8a12cfb
commit 75a06421e5
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/hotspot/jtreg/runtime/cds/appcds/MoveJDKTest.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018, 2020, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2018, 2021, Oracle and/or its affiliates. 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.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -54,7 +54,8 @@ public class MoveJDKTest {
String jsaOpt = "-XX:SharedArchiveFile=" + jsaFile; String jsaOpt = "-XX:SharedArchiveFile=" + jsaFile;
{ {
ProcessBuilder pb = makeBuilder(java_home_src + "/bin/java", "-Xshare:dump", jsaOpt); ProcessBuilder pb = makeBuilder(java_home_src + "/bin/java", "-Xshare:dump", jsaOpt);
TestCommon.executeAndLog(pb, "dump"); TestCommon.executeAndLog(pb, "dump")
.shouldHaveExitValue(0);
} }
{ {
ProcessBuilder pb = makeBuilder(java_home_src + "/bin/java", ProcessBuilder pb = makeBuilder(java_home_src + "/bin/java",
@ -63,6 +64,7 @@ public class MoveJDKTest {
"-Xlog:class+path=info", "-Xlog:class+path=info",
"-version"); "-version");
OutputAnalyzer out = TestCommon.executeAndLog(pb, "exec-src"); OutputAnalyzer out = TestCommon.executeAndLog(pb, "exec-src");
out.shouldHaveExitValue(0);
out.shouldNotContain("shared class paths mismatch"); out.shouldNotContain("shared class paths mismatch");
out.shouldNotContain("BOOT classpath mismatch"); out.shouldNotContain("BOOT classpath mismatch");
} }
@ -78,6 +80,7 @@ public class MoveJDKTest {
"-Xlog:class+path=info", "-Xlog:class+path=info",
"-version"); "-version");
OutputAnalyzer out = TestCommon.executeAndLog(pb, "exec-dst"); OutputAnalyzer out = TestCommon.executeAndLog(pb, "exec-dst");
out.shouldHaveExitValue(0);
out.shouldNotContain("shared class paths mismatch"); out.shouldNotContain("shared class paths mismatch");
out.shouldNotContain("BOOT classpath mismatch"); out.shouldNotContain("BOOT classpath mismatch");
} }
@ -91,7 +94,8 @@ public class MoveJDKTest {
"-Xshare:dump", "-Xshare:dump",
dumptimeBootAppendOpt, dumptimeBootAppendOpt,
jsaOpt); jsaOpt);
TestCommon.executeAndLog(pb, "dump"); TestCommon.executeAndLog(pb, "dump")
.shouldHaveExitValue(0);
} }
{ {
String runtimeBootAppendOpt = dumptimeBootAppendOpt + System.getProperty("path.separator") + helloJar; String runtimeBootAppendOpt = dumptimeBootAppendOpt + System.getProperty("path.separator") + helloJar;
@ -102,6 +106,7 @@ public class MoveJDKTest {
"-Xlog:class+path=info", "-Xlog:class+path=info",
"-version"); "-version");
OutputAnalyzer out = TestCommon.executeAndLog(pb, "exec-dst"); OutputAnalyzer out = TestCommon.executeAndLog(pb, "exec-dst");
out.shouldHaveExitValue(0);
out.shouldNotContain("shared class paths mismatch"); out.shouldNotContain("shared class paths mismatch");
out.shouldNotContain("BOOT classpath mismatch"); out.shouldNotContain("BOOT classpath mismatch");
} }