Skip to content

Commit

Permalink
8296710: Update to use jtreg 7.1
Browse files Browse the repository at this point in the history
Reviewed-by: erikj, alanb, jjg
  • Loading branch information
sormuras committed Dec 1, 2022
1 parent 4899d78 commit c70d1e1
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion make/autoconf/lib-tests.m4
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
################################################################################

# Minimum supported version
JTREG_MINIMUM_VERSION=7
JTREG_MINIMUM_VERSION=7.1

###############################################################################
#
Expand Down
2 changes: 1 addition & 1 deletion make/conf/github-actions.conf
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
# Versions and download locations for dependencies used by GitHub Actions (GHA)

GTEST_VERSION=1.8.1
JTREG_VERSION=7+1
JTREG_VERSION=7.1+1

LINUX_X64_BOOT_JDK_EXT=tar.gz
LINUX_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk19/877d6127e982470ba2a7faa31cc93d04/36/GPL/openjdk-19_linux-x64_bin.tar.gz
Expand Down
4 changes: 2 additions & 2 deletions make/conf/jib-profiles.js
Original file line number Diff line number Diff line change
Expand Up @@ -1135,9 +1135,9 @@ var getJibProfilesDependencies = function (input, common) {
jtreg: {
server: "jpg",
product: "jtreg",
version: "7",
version: "7.1",
build_number: "1",
file: "bundles/jtreg-7+1.zip",
file: "bundles/jtreg-7.1+1.zip",
environment_name: "JT_HOME",
environment_path: input.get("jtreg", "home_path") + "/bin",
configure_args: "--with-jtreg=" + input.get("jtreg", "home_path"),
Expand Down
2 changes: 1 addition & 1 deletion test/hotspot/jtreg/TEST.ROOT
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ requires.properties= \
jdk.containerized

# Minimum jtreg version
requiredVersion=7+1
requiredVersion=7.1+1

# Path to libraries in the topmost test directory. This is needed so @library
# does not need ../../../ notation to reach them
Expand Down
2 changes: 1 addition & 1 deletion test/jaxp/TEST.ROOT
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ modules=java.xml
groups=TEST.groups

# Minimum jtreg version
requiredVersion=7+1
requiredVersion=7.1+1

# Path to libraries in the topmost test directory. This is needed so @library
# does not need ../../ notation to reach them
Expand Down
2 changes: 1 addition & 1 deletion test/jdk/TEST.ROOT
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ requires.properties= \
jdk.containerized

# Minimum jtreg version
requiredVersion=7+1
requiredVersion=7.1+1

# Path to libraries in the topmost test directory. This is needed so @library
# does not need ../../ notation to reach them
Expand Down
2 changes: 1 addition & 1 deletion test/langtools/TEST.ROOT
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ keys=intermittent randomness needs-src needs-src-jdk_javadoc
groups=TEST.groups

# Minimum jtreg version
requiredVersion=7+1
requiredVersion=7.1+1

# Use new module options
useNewOptions=true
Expand Down
2 changes: 1 addition & 1 deletion test/lib-test/TEST.ROOT
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
keys=randomness

# Minimum jtreg version
requiredVersion=7+1
requiredVersion=7.1+1

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

1 comment on commit c70d1e1

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.