-
Notifications
You must be signed in to change notification settings - Fork 5.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
8296754: AutoCreateSharedArchive in JDK 20 is not compatible with JDK 19
Reviewed-by: ccheung, iklam, erikj
- Loading branch information
Showing
8 changed files
with
235 additions
and
59 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
144 changes: 144 additions & 0 deletions
144
test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/TestAutoCreateSharedArchiveUpgrade.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,144 @@ | ||
| /* | ||
| * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. | ||
| * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
| * | ||
| * This code is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU General Public License version 2 only, as | ||
| * published by the Free Software Foundation. | ||
| * | ||
| * This code is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
| * version 2 for more details (a copy is included in the LICENSE file that | ||
| * accompanied this code). | ||
| * | ||
| * You should have received a copy of the GNU General Public License version | ||
| * 2 along with this work; if not, write to the Free Software Foundation, | ||
| * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| * | ||
| * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
| * or visit www.oracle.com if you need additional information or have any | ||
| * questions. | ||
| * | ||
| */ | ||
|
|
||
|
|
||
| /* | ||
| * @test | ||
| * @summary Check that -XX:+AutoCreateSharedArchive automatically recreates an archive when you change the JDK version. | ||
| * @requires os.family == "linux" & vm.bits == "64" & (os.arch=="amd64" | os.arch=="x86_64") | ||
| * @library /test/lib | ||
| * @compile -source 1.8 -target 1.8 ../test-classes/HelloJDK8.java | ||
| * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar Hello.jar HelloJDK8 | ||
| * @run driver TestAutoCreateSharedArchiveUpgrade | ||
| */ | ||
|
|
||
| import java.io.File; | ||
| import jdk.test.lib.helpers.ClassFileInstaller; | ||
| import jdk.test.lib.process.OutputAnalyzer; | ||
| import jdk.test.lib.process.ProcessTools; | ||
|
|
||
| public class TestAutoCreateSharedArchiveUpgrade { | ||
| // The JDK being tested | ||
| private static final String TEST_JDK = System.getProperty("test.jdk", null); | ||
|
|
||
| // If you're running this test manually, specify the location of a previous version of | ||
| // the JDK using "jtreg -vmoption:-Dtest.previous.jdk=${JDK19_HOME} ..." | ||
| private static final String PREV_JDK = System.getProperty("test.previous.jdk", null); | ||
|
|
||
| // If you're unning this test using something like | ||
| // "make test TEST=test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/TestAutoCreateSharedArchiveUpgrade.java", | ||
| // the test.boot.jdk property is passed by make/RunTests.gmk | ||
| private static final String BOOT_JDK = System.getProperty("test.boot.jdk", null); | ||
|
|
||
| private static final String USER_DIR = System.getProperty("user.dir", "."); | ||
| private static final String FS = System.getProperty("file.separator", "/"); | ||
|
|
||
| private static final String JAR = ClassFileInstaller.getJarPath("Hello.jar"); | ||
| private static final String JSA = USER_DIR + FS + "Hello.jsa"; | ||
|
|
||
| private static String oldJVM; | ||
| private static String newJVM; | ||
|
|
||
| public static void main(String[] args) throws Throwable { | ||
| setupJVMs(); | ||
| doTest(); | ||
| } | ||
|
|
||
| static void setupJVMs() throws Throwable { | ||
| if (TEST_JDK == null) { | ||
| throw new RuntimeException("-Dtest.jdk should point to the JDK being tested"); | ||
| } | ||
|
|
||
| newJVM = TEST_JDK + FS + "bin" + FS + "java"; | ||
|
|
||
| if (PREV_JDK != null) { | ||
| oldJVM = PREV_JDK + FS + "bin" + FS + "java"; | ||
| } else if (BOOT_JDK != null) { | ||
| oldJVM = BOOT_JDK + FS + "bin" + FS + "java"; | ||
| } else { | ||
| throw new RuntimeException("Use -Dtest.previous.jdk or -Dtest.boot.jdk to specify a " + | ||
| "previous version of the JDK that supports " + | ||
| "-XX:+AutoCreateSharedArchive"); | ||
| } | ||
|
|
||
| System.out.println("Using newJVM = " + newJVM); | ||
| System.out.println("Using oldJVM = " + oldJVM); | ||
| } | ||
|
|
||
| static void doTest() throws Throwable { | ||
| File jsaF = new File(JSA); | ||
| jsaF.delete(); | ||
| OutputAnalyzer output; | ||
|
|
||
| // NEW JDK -- create and then use the JSA | ||
| output = run(newJVM); | ||
| assertJSANotFound(output); | ||
| assertCreatedJSA(output); | ||
|
|
||
| output = run(newJVM); | ||
| assertUsedJSA(output); | ||
|
|
||
| // OLD JDK -- should reject the JSA created by NEW JDK, and create its own | ||
| output = run(oldJVM); | ||
| assertJSAVersionMismatch(output); | ||
| assertCreatedJSA(output); | ||
|
|
||
| output = run(oldJVM); | ||
| assertUsedJSA(output); | ||
|
|
||
| // NEW JDK -- should reject the JSA created by OLD JDK, and create its own | ||
| output = run(newJVM); | ||
| assertJSAVersionMismatch(output); | ||
| assertCreatedJSA(output); | ||
|
|
||
| output = run(newJVM); | ||
| assertUsedJSA(output); | ||
| } | ||
|
|
||
| static OutputAnalyzer run(String jvm) throws Throwable { | ||
| OutputAnalyzer output = | ||
| ProcessTools.executeCommand(jvm, "-XX:+AutoCreateSharedArchive", | ||
| "-XX:SharedArchiveFile=" + JSA, | ||
| "-Xlog:cds", | ||
| "-cp", JAR, "HelloJDK8"); | ||
| output.shouldHaveExitValue(0); | ||
| return output; | ||
| } | ||
|
|
||
| static void assertJSANotFound(OutputAnalyzer output) { | ||
| output.shouldContain("Specified shared archive not found"); | ||
| } | ||
|
|
||
| static void assertCreatedJSA(OutputAnalyzer output) { | ||
| output.shouldContain("Dumping shared data to file"); | ||
| } | ||
|
|
||
| static void assertJSAVersionMismatch(OutputAnalyzer output) { | ||
| output.shouldContain("does not match the required version"); | ||
| } | ||
|
|
||
| static void assertUsedJSA(OutputAnalyzer output) { | ||
| output.shouldContain("Mapped dynamic region #0"); | ||
| } | ||
| } |
36 changes: 36 additions & 0 deletions
36
test/hotspot/jtreg/runtime/cds/appcds/test-classes/HelloJDK8.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| /* | ||
| * Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved. | ||
| * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
| * | ||
| * This code is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU General Public License version 2 only, as | ||
| * published by the Free Software Foundation. | ||
| * | ||
| * This code is distributed in the hope that it will be useful, but WITHOUT | ||
| * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
| * version 2 for more details (a copy is included in the LICENSE file that | ||
| * accompanied this code). | ||
| * | ||
| * You should have received a copy of the GNU General Public License version | ||
| * 2 along with this work; if not, write to the Free Software Foundation, | ||
| * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
| * | ||
| * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA | ||
| * or visit www.oracle.com if you need additional information or have any | ||
| * questions. | ||
| * | ||
| */ | ||
|
|
||
|
|
||
| // Used by tests like dynamicArchive/TestAutoCreateSharedArchiveUpgrade.java, which | ||
| // runs this class in an earlier JDK | ||
| // | ||
| // It should be compiled like this in the jtreg spec: | ||
| // @compile -source 1.8 -target 1.8 test-classes/HelloJDK8.java | ||
|
|
||
| public class HelloJDK8 { | ||
| public static void main(String args[]) { | ||
| System.out.println("This class is compiled by JDK 8"); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
a249a52There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Review
Issues