8331431: Update to use jtreg 7.4

Reviewed-by: ihse, erikj, jpai
This commit is contained in:
Christian Stein 2024-06-18 07:25:17 +00:00
parent 0199fee431
commit 99fefec092
8 changed files with 12 additions and 12 deletions

View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2018, 2024, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -28,7 +28,7 @@
################################################################################ ################################################################################
# Minimum supported versions # Minimum supported versions
JTREG_MINIMUM_VERSION=7.3.1 JTREG_MINIMUM_VERSION=7.4
GTEST_MINIMUM_VERSION=1.14.0 GTEST_MINIMUM_VERSION=1.14.0
############################################################################### ###############################################################################

View File

@ -26,7 +26,7 @@
# Versions and download locations for dependencies used by GitHub Actions (GHA) # Versions and download locations for dependencies used by GitHub Actions (GHA)
GTEST_VERSION=1.14.0 GTEST_VERSION=1.14.0
JTREG_VERSION=7.3.1+1 JTREG_VERSION=7.4+1
LINUX_X64_BOOT_JDK_EXT=tar.gz LINUX_X64_BOOT_JDK_EXT=tar.gz
LINUX_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk22/830ec9fcccef480bb3e73fb7ecafe059/36/GPL/openjdk-22_linux-x64_bin.tar.gz LINUX_X64_BOOT_JDK_URL=https://download.java.net/java/GA/jdk22/830ec9fcccef480bb3e73fb7ecafe059/36/GPL/openjdk-22_linux-x64_bin.tar.gz

View File

@ -1184,9 +1184,9 @@ var getJibProfilesDependencies = function (input, common) {
jtreg: { jtreg: {
server: "jpg", server: "jpg",
product: "jtreg", product: "jtreg",
version: "7.3.1", version: "7.4",
build_number: "1", build_number: "1",
file: "bundles/jtreg-7.3.1+1.zip", file: "bundles/jtreg-7.4+1.zip",
environment_name: "JT_HOME", environment_name: "JT_HOME",
environment_path: input.get("jtreg", "home_path") + "/bin", environment_path: input.get("jtreg", "home_path") + "/bin",
configure_args: "--with-jtreg=" + input.get("jtreg", "home_path"), configure_args: "--with-jtreg=" + input.get("jtreg", "home_path"),

View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2005, 2023, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -90,7 +90,7 @@ requires.properties= \
jdk.containerized jdk.containerized
# Minimum jtreg version # Minimum jtreg version
requiredVersion=7.3.1+1 requiredVersion=7.4+1
# Path to libraries in the topmost test directory. This is needed so @library # Path to libraries in the topmost test directory. This is needed so @library
# does not need ../../../ notation to reach them # does not need ../../../ notation to reach them

View File

@ -23,7 +23,7 @@ modules=java.xml
groups=TEST.groups groups=TEST.groups
# Minimum jtreg version # Minimum jtreg version
requiredVersion=7.3.1+1 requiredVersion=7.4+1
# Path to libraries in the topmost test directory. This is needed so @library # Path to libraries in the topmost test directory. This is needed so @library
# does not need ../../ notation to reach them # does not need ../../ notation to reach them

View File

@ -106,7 +106,7 @@ requires.properties= \
jdk.foreign.linker jdk.foreign.linker
# Minimum jtreg version # Minimum jtreg version
requiredVersion=7.3.1+1 requiredVersion=7.4+1
# Path to libraries in the topmost test directory. This is needed so @library # Path to libraries in the topmost test directory. This is needed so @library
# does not need ../../ notation to reach them # does not need ../../ notation to reach them

View File

@ -15,7 +15,7 @@ keys=intermittent randomness needs-src needs-src-jdk_javadoc
groups=TEST.groups groups=TEST.groups
# Minimum jtreg version # Minimum jtreg version
requiredVersion=7.3.1+1 requiredVersion=7.4+1
# Use new module options # Use new module options
useNewOptions=true useNewOptions=true

View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -29,7 +29,7 @@
keys=randomness keys=randomness
# Minimum jtreg version # Minimum jtreg version
requiredVersion=7.3.1+1 requiredVersion=7.4+1
# Path to libraries in the topmost test directory. This is needed so @library # Path to libraries in the topmost test directory. This is needed so @library
# does not need ../../ notation to reach them # does not need ../../ notation to reach them