8272552: mark hotspot runtime/cds tests which ignore external VM flags #2408
Conversation
|
👋 Welcome back ashi! A progress list of the required criteria for merging this PR into |
openjdk
bot
changed the title
|
This backport pull request has now been updated with issue from the original commit. |
openjdk
bot
added
backport
amosshi
changed the title
openjdk
bot
changed the title
|
This backport pull request has now been updated with issue from the original commit. |
| * @modules java.base/jdk.internal.misc | ||
| * java.management | ||
| * @run driver MaxMetaspaceSize | ||
| */ |
There was a problem hiding this comment.
Includes the changes from JDK-8243945 ( commit 46fe7e3 ) on this file
| processArgs.add("-XX:MaxMetaspaceSize=3m"); | ||
| processArgs.add("-XX:CompressedClassSpaceSize=1m"); | ||
| processArgs.add("-XX:InitialBootClassLoaderMetaspaceSize=1m"); | ||
| } else { |
There was a problem hiding this comment.
Includes the changes from JDK-8251158 (commit 7ba6a6b ) on this file
|
|
||
| String msg = "Failed allocating metaspace object"; | ||
| String msg = "OutOfMemoryError: Metaspace"; | ||
| ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(processArgs); |
There was a problem hiding this comment.
Includes the changes from JDK-8261551 (commit 41657b1 ) on this file
| * @build SharedStringsWb sun.hotspot.WhiteBox | ||
| * @run driver ClassFileInstaller -jar whitebox.jar sun.hotspot.WhiteBox | ||
| * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar whitebox.jar sun.hotspot.WhiteBox | ||
| * @run driver SharedStrings |
There was a problem hiding this comment.
Includes the changes from JDK-8263549 ( commit a7aba2b ) on this file
| import jdk.test.lib.process.ProcessTools; | ||
| import jdk.test.lib.process.OutputAnalyzer; | ||
| import jdk.test.lib.helpers.ClassFileInstaller; | ||
|
|
There was a problem hiding this comment.
Includes the changes from JDK-8263412 ( commit e834f99 ) on this file
| * @library /test/lib | ||
| * @modules java.base/jdk.internal.misc | ||
| * java.management | ||
| * @build SharedStringsWb sun.hotspot.WhiteBox |
There was a problem hiding this comment.
Includes the changes from JDK-8229267 ( commit e9b271d ) on this file
| Paths.get(classDir, newFile), | ||
| Files.copy(Paths.get(outDir, "hello.jar"), | ||
| Paths.get(outDir, newFile), | ||
| StandardCopyOption.REPLACE_EXISTING); |
There was a problem hiding this comment.
Includes the changes from JDK-8251213 ( commit c1093dc ) on this file
| import java.nio.file.Paths; | ||
| import java.nio.file.StandardCopyOption; | ||
| import jdk.test.lib.cds.CDSTestUtils; | ||
| import jdk.test.lib.process.OutputAnalyzer; |
There was a problem hiding this comment.
Includes the changes from JDK-8251213 ( commit c1093dc ) on this file
| String java_home_src = System.getProperty("java.home"); | ||
| String java_home_dst = System.getProperty("user.dir") + File.separator + "moved_jdk"; | ||
| String java_home_dst = CDSTestUtils.getOutputDir() + File.separator + "moved_jdk"; | ||
|
|
There was a problem hiding this comment.
Includes the changes from JDK-8251267 ( commit 291ba97 ) on this file
| "-version"); | ||
| OutputAnalyzer out = TestCommon.executeAndLog(pb, "exec-dst"); | ||
| out.shouldHaveExitValue(0); | ||
| out.shouldNotContain("shared class paths mismatch"); |
There was a problem hiding this comment.
Includes the changes from JDK-8272335 ( commit 75a0642 ) on this file
| } | ||
| } | ||
|
|
||
| static ProcessBuilder makeBuilder(String... args) throws Exception { |
There was a problem hiding this comment.
Includes the changes from JDK-8205946 ( commit a10d6e7 ) on this file
| * @modules java.base/jdk.internal.misc | ||
| * java.management | ||
| * jdk.jartool/sun.tools.jar | ||
| * @compile test-classes/Hello.java |
There was a problem hiding this comment.
Includes the changes from JDK-8229267 ( commit e9b271d ) on this file
| * @modules java.base/jdk.internal.module | ||
| * java.management | ||
| * jdk.jlink | ||
| * jdk.compiler |
There was a problem hiding this comment.
Includes the changes from JDK-8229267 ( commit e9b271d ) on this file
| * jdk.jlink | ||
| * jdk.compiler | ||
| * @requires vm.flagless | ||
| * @library /test/jdk/lib/testlibrary /test/lib /test/hotspot/jtreg/runtime/cds/appcds |
There was a problem hiding this comment.
Includes the changes from JDK-8202339 ( commit 1ed3649 ) on this file
| * @run driver ClassFileInstaller -jar app.jar CheckArchivedModuleApp | ||
| * @run driver ClassFileInstaller -jar WhiteBox.jar sun.hotspot.WhiteBox | ||
| * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar app.jar CheckArchivedModuleApp | ||
| * @run driver jdk.test.lib.helpers.ClassFileInstaller -jar WhiteBox.jar sun.hotspot.WhiteBox |
There was a problem hiding this comment.
Includes the changes from JDK-8263549 ( commit a7aba2b ) on this file
| import jdk.test.lib.compiler.CompilerUtils; | ||
| import jdk.test.lib.process.OutputAnalyzer; | ||
| import jdk.test.lib.process.ProcessTools; | ||
| import jdk.test.lib.helpers.ClassFileInstaller; |
There was a problem hiding this comment.
Includes the changes from JDK-8263412 ( commit e834f99 ) on this file
| customJava.toString(), | ||
| "-XX:SharedArchiveFile=./ArchivedModuleWithCustomImageTest.jsa", | ||
| "-Xshare:dump"}; | ||
| "-Xshare:dump", "-Xlog:cds"}; |
There was a problem hiding this comment.
Includes the changes from JDK-8233826 ( commit d1ad0ea ) on this file
phohensee
left a comment
phohensee
left a comment
There was a problem hiding this comment.
Why complicate a trivial backport by bringing in changes from JDK-8243945 and friends? You could instead just backport them. If a full backport of a particular JBS issue is infeasible due to prerequisites that are unlikely to be approved, you could file a JBS issue against 11u to backport just the test changes in the original commits.
|
There are
|
2 participants
Backport of JDK-8123456
test/hotspot/jtreg/runtime/cds/folder, while in Java 11 they are in different foldersThis is an
Uncleanbackport, because oftest/hotspot/jtreg/runtime/cds/, while this folder does not exist in Java 11. Wheretest/hotspot/jtreg/runtime/cds/MaxMetaspaceSize.javamatch totest/hotspot/jtreg/runtime/SharedArchiveFile/MaxMetaspaceSize.javain Java 11test/hotspot/jtreg/runtime/cds/SharedStrings.javamatch totest/hotspot/jtreg/runtime/SharedArchiveFile/SharedStrings.javain Java 11test/hotspot/jtreg/runtime/cds/appcds/MoveJDKTest.javamatch totest/hotspot/jtreg/runtime/appcds/MoveJDKTest.javain Java 11test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedModuleWithCustomImageTest.javamatche totest/hotspot/jtreg/runtime/appcds/cacheObject/ArchivedModuleWithCustomImageTest.javain Java 11test/hotspot/jtreg/runtime/cds/appcds/VerifyWithDefaultArchive.javadoes not existin Java 11, it was added by JDK-8264337 on Java 17test/hotspot/jtreg/runtime/cds/appcds/jcmd/JCmdTestDynamicDump.javadoes not existin Java 11, it was added by JDK-8265393 on Java 17Tests
Progress
Issue
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk11u-dev.git pull/2408/head:pull/2408$ git checkout pull/2408Update a local copy of the PR:
$ git checkout pull/2408$ git pull https://git.openjdk.org/jdk11u-dev.git pull/2408/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 2408View PR using the GUI difftool:
$ git pr show -t 2408Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk11u-dev/pull/2408.diff
Webrev
Link to Webrev Comment