From 39005e27d6e543def13992740f663b78a8b07671 Mon Sep 17 00:00:00 2001 From: Calvin Cheung Date: Fri, 19 Jan 2024 17:02:29 +0000 Subject: [PATCH] 8324041: ModuleOption.java failed with update release versioning scheme Reviewed-by: dholmes, mbaesken --- .../runtime/cds/appcds/jigsaw/module/ModuleOption.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/module/ModuleOption.java b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/module/ModuleOption.java index b7b0e8778c804..fa4fa5321eeb1 100644 --- a/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/module/ModuleOption.java +++ b/test/hotspot/jtreg/runtime/cds/appcds/jigsaw/module/ModuleOption.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2024, 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 @@ -38,7 +38,10 @@ public static void main(String[] args) throws Exception { final String moduleOption = "jdk.httpserver/sun.net.httpserver.simpleserver.Main"; final String incubatorModule = "jdk.incubator.vector"; final String loggingOption = "-Xlog:cds=debug,cds+module=debug,cds+heap=info,module=trace"; - final String versionPattern = "java.[0-9][0-9][-].*"; + // Pattern of a module version string. + // e.g. JDK 22: "java 22" + // JDK 22.0.1: "java 22.0.1" + final String versionPattern = "java.[0-9][0-9].*"; final String subgraphCannotBeUsed = "subgraph jdk.internal.module.ArchivedBootLayer cannot be used because full module graph is disabled"; String archiveName = TestCommon.getNewArchiveName("module-option"); TestCommon.setCurrentArchiveName(archiveName);