On Sat, 22 Mar 2025 03:46:38 GMT, Jiangli Zhou <jian...@openjdk.org> wrote:
> 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()`. This pull request has now been integrated. Changeset: 79824c34 Author: Jiangli Zhou <jian...@openjdk.org> URL: https://git.openjdk.org/jdk/commit/79824c344ee36bcf9f3434ccb3b44d2d24defc5c Stats: 53 lines in 5 files changed: 29 ins; 8 del; 16 mod 8352184: Jtreg tests using CommandLineOptionTest.getVMTypeOption() and optionsvalidation.JVMOptionsUtils fail on static JDK Reviewed-by: dholmes, shade ------------- PR: https://git.openjdk.org/jdk/pull/24171
