> Please review following changes, thanks. > > - Add `static` to the vm_info for static JDK. The `-version` output now > contains `static` on static JDK, e.g.: > > > $ static-jdk/bin/java -version > openjdk version "25-internal" 2025-09-16 > OpenJDK Runtime Environment (fastdebug build > 25-internal-adhoc.jianglizhou.jdk) > OpenJDK 64-Bit Server VM (fastdebug build 25-internal-adhoc.jianglizhou.jdk, > mixed mode, static, sharing) > > $ jdk/bin/java -version > openjdk version "25-internal" 2025-09-16 > OpenJDK Runtime Environment (fastdebug build > 25-internal-adhoc.jianglizhou.jdk) > OpenJDK 64-Bit Server VM (fastdebug build 25-internal-adhoc.jianglizhou.jdk, > mixed mode, sharing) > > > Following changes resolve jtreg test failures on static JDK due to > '-server|-client|-minimal|-zero' flag added by > `CommandLineOptionTest.getVMTypeOption()` or > `optionsvalidation.JVMOptionsUtils`. '-server|-client|-minimal|-zero' flags > are unrecognized on static JDK (please see > https://bugs.openjdk.org/browse/JDK-8350982). > > - Add `jdk.test.lib.Platform.isStatic()`, which checks for `static` in > `java.vm.info` system property to determine if current test is running on > static JDK. > - Change `CommandLineOptionTest` to only call `getVMTypeOption()` on regular > JDK (`!Platform.isStatic()`). > - Change `optionsvalidation.JVMOptionsUtils` to only set VMType to > '-server|-client|-minimal' on regular JDK ( `!Platform.isStatic()`.
Jiangli Zhou has updated the pull request incrementally with one additional commit since the last revision: Address @shipilev comments: - In JVMOptionsUtils.<clinit>, make `if (Platform.isStatic())` block as a preceding block of other checks. - In Abstract_VM_Version::vm_info_string(), break lines. ------------- Changes: - all: https://git.openjdk.org/jdk/pull/24171/files - new: https://git.openjdk.org/jdk/pull/24171/files/bfaa6e48..b059c11c Webrevs: - full: https://webrevs.openjdk.org/?repo=jdk&pr=24171&range=03 - incr: https://webrevs.openjdk.org/?repo=jdk&pr=24171&range=02-03 Stats: 16 lines in 2 files changed: 5 ins; 0 del; 11 mod Patch: https://git.openjdk.org/jdk/pull/24171.diff Fetch: git fetch https://git.openjdk.org/jdk.git pull/24171/head:pull/24171 PR: https://git.openjdk.org/jdk/pull/24171
