stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8266254: Update to use jtreg 6

Browse Source 
8265020: tests must be updated for new TestNG module name

Reviewed-by: lancea, erikj, mchung, naoto, alanb, iris, chegar
This commit is contained in:
Jonathan Gibbons 2021-06-02 21:20:12 +00:00
parent 375f8f3bff
commit 3482cb87fd
11 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
make/conf/jib-profiles.js
View File

@ -1133,10 +1133,9 @@ var getJibProfilesDependencies = function (input, common) {
jtreg: { jtreg: {
server: "jpg", server: "jpg",
product: "jtreg", product: "jtreg",
version: "5.1", version: "6",
build_number: "b01", build_number: "1",
checksum_file: "MD5_VALUES", file: "bundles/jtreg-6+1.zip",
file: "bundles/jtreg_bin-5.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"),

2
test/hotspot/jtreg/TEST.ROOT
View File

@ -78,7 +78,7 @@ requires.properties= \
jdk.containerized jdk.containerized
# Minimum jtreg version # Minimum jtreg version
requiredVersion=5.1 b1 requiredVersion=6+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

2
test/jaxp/TEST.ROOT
View File

@ -23,7 +23,7 @@ modules=java.xml
groups=TEST.groups groups=TEST.groups
# Minimum jtreg version # Minimum jtreg version
requiredVersion=5.1 b1 requiredVersion=6+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

2
test/jdk/TEST.ROOT
View File

@ -67,7 +67,7 @@ requires.properties= \
jdk.containerized jdk.containerized
# Minimum jtreg version # Minimum jtreg version
requiredVersion=5.1 b1 requiredVersion=6+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

6
test/jdk/java/lang/ModuleTests/addXXX/test/module-info.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2017, 2021, 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
@ -21,10 +21,10 @@
* questions. * questions.
*/ */
module test { module test {
exports test to testng; exports test to org.testng;
requires m2; requires m2;
requires m3; requires m3;
requires m4; requires m4;
requires testng; requires org.testng;
} }

6
test/jdk/java/lang/invoke/MethodHandles/privateLookupIn/test/module-info.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2016, 2021, 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
@ -22,6 +22,6 @@
*/ */
module test { module test {
requires testng; requires org.testng;
exports p to testng; // TestNG invokes the public methods exports p to org.testng; // TestNG invokes the public methods
} }

4
test/jdk/java/lang/invoke/modules/m1/module-info.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2015, 2021, 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
@ -22,6 +22,6 @@
*/ */
module m1 { module m1 {
requires m2; requires m2;
requires testng; requires org.testng;
exports p1; exports p1;
} }

4
test/jdk/java/lang/invoke/modules/m3/module-info.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2019, 2021, 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
@ -24,7 +24,7 @@
module m3 { module m3 {
requires m4; requires m4;
requires m5; requires m5;
requires testng; requires org.testng;
requires java.management; requires java.management;
exports c1; exports c1;
opens c2 to m5; opens c2 to m5;

6
test/jdk/java/util/ServiceLoader/security/test/module-info.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2017, 2021, 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
@ -36,6 +36,6 @@ module test {
provides S4 with P4; provides S4 with P4;
provides S5 with P5; provides S5 with P5;
provides S6 with P6; provides S6 with P6;
requires testng; requires org.testng;
exports p to testng; exports p to org.testng;
} }

2
test/langtools/TEST.ROOT
View File

@ -15,7 +15,7 @@ keys=intermittent randomness
groups=TEST.groups groups=TEST.groups
# Minimum jtreg version # Minimum jtreg version
requiredVersion=5.1 b1 requiredVersion=6+1
# Use new module options # Use new module options
useNewOptions=true useNewOptions=true

4
test/lib-test/TEST.ROOT
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2020, 2021 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=5.1 b1 requiredVersion=6+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