[jdk11u-dev] RFR: 8272552: mark hotspot runtime/cds tests which ignore external VM flags

Amos Shi ashi at openjdk.org
Tue Dec 19 20:13:53 UTC 2023


On Mon, 18 Dec 2023 22:01:17 GMT, Amos Shi <ashi at openjdk.org> wrote:

> Backport of [JDK-8123456](https://bugs.openjdk.org/browse/JDK-8123456)
> 
> This is an `Unclean` backport, because of
> - The [original commit](https://github.com/openjdk/jdk/commit/989f39f8106a22498053a4ca5f2becf8df5f2420) was changing the files in the folder `test/hotspot/jtreg/runtime/cds/`, while this folder does not exist in Java 11. Where
>   1. file `test/hotspot/jtreg/runtime/cds/MaxMetaspaceSize.java` match to `test/hotspot/jtreg/runtime/SharedArchiveFile/MaxMetaspaceSize.java` in Java 11
>   1. file `test/hotspot/jtreg/runtime/cds/SharedStrings.java` match to `test/hotspot/jtreg/runtime/SharedArchiveFile/SharedStrings.java` in Java 11
>   1. file `test/hotspot/jtreg/runtime/cds/appcds/MoveJDKTest.java` match to `test/hotspot/jtreg/runtime/appcds/MoveJDKTest.java` in Java 11
>   1. file `test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedModuleWithCustomImageTest.java` matche to `test/hotspot/jtreg/runtime/appcds/cacheObject/ArchivedModuleWithCustomImageTest.java` in Java 11
>   1. file `test/hotspot/jtreg/runtime/cds/appcds/VerifyWithDefaultArchive.java` `does not exist` in Java 11, it was added by [JDK-8264337](https://bugs.openjdk.org/browse/JDK-8264337) on Java 17
>   1. file `test/hotspot/jtreg/runtime/cds/appcds/jcmd/JCmdTestDynamicDump.java` `does not exist` in Java 11, it was added by [JDK-8265393](https://bugs.openjdk.org/browse/JDK-8265393) on Java 17
> - So For those four (4) moved files
>   1. we applied the change in the original commit
>   1. and also all the missing commits in between
> - For those two (2) missing files
>   - which were added in Java 17, and does not exist in Java 11
>   - we simply add them
> 
> Tests
> - Test Succeeded in local laptop of MacOS M1 CPU Machine
> - PR: Issue found, under investigation
> - Test Machine: (to run)

test/hotspot/jtreg/runtime/appcds/MoveJDKTest.java line 34:

> 32:  * @requires os.family != "windows"
> 33:  * @library /test/lib
> 34:  * @compile test-classes/Hello.java

Includes the changes from [JDK-8229267](https://bugs.openjdk.org/browse/JDK-8229267) ( commit [e9b271d](https://github.com/openjdk/jdk/commit/e9b271dd1065994e4538e3a628e3f3542fdcacb5) ) on this file

test/hotspot/jtreg/runtime/appcds/MoveJDKTest.java line 44:

> 42: import java.nio.file.StandardCopyOption;
> 43: import jdk.test.lib.cds.CDSTestUtils;
> 44: import jdk.test.lib.process.OutputAnalyzer;

Includes the changes from [JDK-8251213](https://bugs.openjdk.org/browse/JDK-8251213) ( commit [c1093dc](https://github.com/openjdk/jdk/commit/c1093dc2447c39c0bd1e1db3627dd353662a5040) ) on this file

test/hotspot/jtreg/runtime/appcds/MoveJDKTest.java line 50:

> 48:         String java_home_src = System.getProperty("java.home");
> 49:         String java_home_dst = CDSTestUtils.getOutputDir() + File.separator + "moved_jdk";
> 50: 

Includes the changes from [JDK-8251267](https://bugs.openjdk.org/browse/JDK-8251267) ( commit [291ba97](https://github.com/openjdk/jdk/commit/291ba97fab29bdd1e423aff8e660d9d6311d7c89) ) on this file

test/hotspot/jtreg/runtime/appcds/MoveJDKTest.java line 109:

> 107:             OutputAnalyzer out = TestCommon.executeAndLog(pb, "exec-dst");
> 108:             out.shouldHaveExitValue(0);
> 109:             out.shouldNotContain("shared class paths mismatch");

Includes the changes from [JDK-8272335](https://bugs.openjdk.org/browse/JDK-8272335) ( commit [75a0642](https://github.com/openjdk/jdk/commit/75a06421e596b0e0006120a13836ec65a3ab9d46) ) on this file

test/hotspot/jtreg/runtime/appcds/MoveJDKTest.java line 177:

> 175:     }
> 176: 
> 177:     static ProcessBuilder makeBuilder(String... args) throws Exception {

Includes the changes from [JDK-8205946](https://bugs.openjdk.org/browse/JDK-8205946) ( commit [a10d6e7](https://github.com/openjdk/jdk/commit/a10d6e71d8b78563648b7fec63c8edc79c27cc77) ) on this file

test/hotspot/jtreg/runtime/appcds/MoveJDKTest.java line 193:

> 191:         Files.copy(Paths.get(outDir, "hello.jar"),
> 192:             Paths.get(outDir, newFile),
> 193:             StandardCopyOption.REPLACE_EXISTING);

Includes the changes from [JDK-8251213](https://bugs.openjdk.org/browse/JDK-8251213) ( commit [c1093dc](https://github.com/openjdk/jdk/commit/c1093dc2447c39c0bd1e1db3627dd353662a5040) ) on this file

test/hotspot/jtreg/runtime/appcds/cacheObject/ArchivedModuleWithCustomImageTest.java line 32:

> 30:  *          java.management
> 31:  *          jdk.jlink
> 32:  *          jdk.compiler

Includes the changes from [JDK-8229267](https://bugs.openjdk.org/browse/JDK-8229267) ( commit [e9b271d](https://github.com/openjdk/jdk/commit/e9b271dd1065994e4538e3a628e3f3542fdcacb5) ) on this file

-------------

PR Review Comment: https://git.openjdk.org/jdk11u-dev/pull/2408#discussion_r1431892561
PR Review Comment: https://git.openjdk.org/jdk11u-dev/pull/2408#discussion_r1431888051
PR Review Comment: https://git.openjdk.org/jdk11u-dev/pull/2408#discussion_r1431889017
PR Review Comment: https://git.openjdk.org/jdk11u-dev/pull/2408#discussion_r1431890039
PR Review Comment: https://git.openjdk.org/jdk11u-dev/pull/2408#discussion_r1431891185
PR Review Comment: https://git.openjdk.org/jdk11u-dev/pull/2408#discussion_r1431887925
PR Review Comment: https://git.openjdk.org/jdk11u-dev/pull/2408#discussion_r1431893521


More information about the jdk-updates-dev mailing list