Skip to content

Commit 75e1441

Browse files
committed
8314495: Update to use jtreg 7.3.1
Reviewed-by: mdoerr, clanger Backport-of: c50315de8f13d316a7de08be53716cd88fa801c4
1 parent c4612c1 commit 75e1441

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

make/autoconf/lib-tests.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
################################################################################
2929

3030
# Minimum supported version
31-
JTREG_MINIMUM_VERSION=6.1
31+
JTREG_MINIMUM_VERSION=7.3.1
3232

3333
###############################################################################
3434
#

make/conf/github-actions.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
# Versions and download locations for dependencies used by GitHub Actions (GHA)
2727

2828
GTEST_VERSION=1.8.1
29-
JTREG_VERSION=6.1+3
29+
JTREG_VERSION=7.3.1+1
3030

3131
LINUX_X64_BOOT_JDK_EXT=tar.gz
3232
LINUX_X64_BOOT_JDK_URL=https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.6%2B10/OpenJDK17U-jdk_x64_linux_hotspot_17.0.6_10.tar.gz

make/conf/jib-profiles.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1156,9 +1156,9 @@ var getJibProfilesDependencies = function (input, common) {
11561156
jtreg: {
11571157
server: "jpg",
11581158
product: "jtreg",
1159-
version: "6",
1159+
version: "7.3.1",
11601160
build_number: "1",
1161-
file: "bundles/jtreg-6+1.zip",
1161+
file: "bundles/jtreg-7.3.1+1.zip",
11621162
environment_name: "JT_HOME",
11631163
environment_path: input.get("jtreg", "home_path") + "/bin",
11641164
configure_args: "--with-jtreg=" + input.get("jtreg", "home_path"),

test/hotspot/jtreg/TEST.ROOT

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2005, 2021, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -79,7 +79,7 @@ requires.properties= \
7979
jdk.containerized
8080

8181
# Minimum jtreg version
82-
requiredVersion=6+1
82+
requiredVersion=7.3.1+1
8383

8484
# Path to libraries in the topmost test directory. This is needed so @library
8585
# does not need ../../../ notation to reach them

test/jaxp/TEST.ROOT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ modules=java.xml
2323
groups=TEST.groups
2424

2525
# Minimum jtreg version
26-
requiredVersion=6+1
26+
requiredVersion=7.3.1+1
2727

2828
# Path to libraries in the topmost test directory. This is needed so @library
2929
# does not need ../../ notation to reach them

test/jdk/TEST.ROOT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ requires.properties= \
7171
jdk.containerized
7272

7373
# Minimum jtreg version
74-
requiredVersion=6+1
74+
requiredVersion=7.3.1+1
7575

7676
# Path to libraries in the topmost test directory. This is needed so @library
7777
# does not need ../../ notation to reach them

test/langtools/TEST.ROOT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ keys=intermittent randomness
1515
groups=TEST.groups
1616

1717
# Minimum jtreg version
18-
requiredVersion=6+1
18+
requiredVersion=7.3.1+1
1919

2020
# Use new module options
2121
useNewOptions=true

test/lib-test/TEST.ROOT

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2020, 2021, Oracle and/or its affiliates. All rights reserved.
2+
# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
33
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
#
55
# This code is free software; you can redistribute it and/or modify it
@@ -29,7 +29,7 @@
2929
keys=randomness
3030

3131
# Minimum jtreg version
32-
requiredVersion=6+1
32+
requiredVersion=7.3.1+1
3333

3434
# Path to libraries in the topmost test directory. This is needed so @library
3535
# does not need ../../ notation to reach them

0 commit comments

Comments
 (0)