From 2763cf14e6a174511ae8af471690ef18b10b3998 Mon Sep 17 00:00:00 2001 From: Christian Stein Date: Mon, 24 Apr 2023 15:36:19 +0000 Subject: [PATCH] 8304896: Update to use jtreg 7.2 Reviewed-by: erikj, lmesnik, iris --- make/autoconf/lib-tests.m4 | 2 +- make/conf/github-actions.conf | 2 +- make/conf/jib-profiles.js | 4 ++-- test/hotspot/jtreg/TEST.ROOT | 2 +- test/jaxp/TEST.ROOT | 2 +- test/jdk/TEST.ROOT | 2 +- test/langtools/TEST.ROOT | 2 +- test/lib-test/TEST.ROOT | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/make/autoconf/lib-tests.m4 b/make/autoconf/lib-tests.m4 index 6af9045a136..aa02ac4ef97 100644 --- a/make/autoconf/lib-tests.m4 +++ b/make/autoconf/lib-tests.m4 @@ -28,7 +28,7 @@ ################################################################################ # Minimum supported versions -JTREG_MINIMUM_VERSION=7.1.1 +JTREG_MINIMUM_VERSION=7.2 GTEST_MINIMUM_VERSION=1.13.0 ############################################################################### diff --git a/make/conf/github-actions.conf b/make/conf/github-actions.conf index 665b3a701eb..35d26baaccb 100644 --- a/make/conf/github-actions.conf +++ b/make/conf/github-actions.conf @@ -26,7 +26,7 @@ # Versions and download locations for dependencies used by GitHub Actions (GHA) GTEST_VERSION=1.13.0 -JTREG_VERSION=7.1.1+1 +JTREG_VERSION=7.2+1 LINUX_X64_BOOT_JDK_EXT=tar.gz LINUX_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk20/bdc68b4b9cbc4ebcb30745c85038d91d/36/GPL/openjdk-20_linux-x64_bin.tar.gz diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js index 23192afe7ba..d3b5aa2459d 100644 --- a/make/conf/jib-profiles.js +++ b/make/conf/jib-profiles.js @@ -1150,9 +1150,9 @@ var getJibProfilesDependencies = function (input, common) { jtreg: { server: "jpg", product: "jtreg", - version: "7.1.1", + version: "7.2", build_number: "1", - file: "bundles/jtreg-7.1.1+1.zip", + file: "bundles/jtreg-7.2+1.zip", environment_name: "JT_HOME", environment_path: input.get("jtreg", "home_path") + "/bin", configure_args: "--with-jtreg=" + input.get("jtreg", "home_path"), diff --git a/test/hotspot/jtreg/TEST.ROOT b/test/hotspot/jtreg/TEST.ROOT index 8b16798e3d7..6669b9a3816 100644 --- a/test/hotspot/jtreg/TEST.ROOT +++ b/test/hotspot/jtreg/TEST.ROOT @@ -80,7 +80,7 @@ requires.properties= \ jdk.containerized # Minimum jtreg version -requiredVersion=7.1.1+1 +requiredVersion=7.2+1 # Path to libraries in the topmost test directory. This is needed so @library # does not need ../../../ notation to reach them diff --git a/test/jaxp/TEST.ROOT b/test/jaxp/TEST.ROOT index fe569a3b5d1..3b1b13fdcfd 100644 --- a/test/jaxp/TEST.ROOT +++ b/test/jaxp/TEST.ROOT @@ -23,7 +23,7 @@ modules=java.xml groups=TEST.groups # Minimum jtreg version -requiredVersion=7.1.1+1 +requiredVersion=7.2+1 # Path to libraries in the topmost test directory. This is needed so @library # does not need ../../ notation to reach them diff --git a/test/jdk/TEST.ROOT b/test/jdk/TEST.ROOT index 2c20eb886dd..526d68cd29e 100644 --- a/test/jdk/TEST.ROOT +++ b/test/jdk/TEST.ROOT @@ -72,7 +72,7 @@ requires.properties= \ jdk.containerized # Minimum jtreg version -requiredVersion=7.1.1+1 +requiredVersion=7.2+1 # Path to libraries in the topmost test directory. This is needed so @library # does not need ../../ notation to reach them diff --git a/test/langtools/TEST.ROOT b/test/langtools/TEST.ROOT index 04485c0d7ed..0e0ece858ab 100644 --- a/test/langtools/TEST.ROOT +++ b/test/langtools/TEST.ROOT @@ -15,7 +15,7 @@ keys=intermittent randomness needs-src needs-src-jdk_javadoc groups=TEST.groups # Minimum jtreg version -requiredVersion=7.1.1+1 +requiredVersion=7.2+1 # Use new module options useNewOptions=true diff --git a/test/lib-test/TEST.ROOT b/test/lib-test/TEST.ROOT index 306d2bd7c6e..65c9b6d5402 100644 --- a/test/lib-test/TEST.ROOT +++ b/test/lib-test/TEST.ROOT @@ -29,7 +29,7 @@ keys=randomness # Minimum jtreg version -requiredVersion=7.1.1+1 +requiredVersion=7.2+1 # Path to libraries in the topmost test directory. This is needed so @library # does not need ../../ notation to reach them