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

8287398: Allow concurrent execution of hotspot docker tests

Browse Source 
Reviewed-by: shade, mseledtsov, sgehwolf
This commit is contained in:
Ioi Lam 2022-06-01 15:51:47 +00:00
parent 8071b2311c
commit 67ecd30327
2 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test/hotspot/jtreg/containers/docker/TEST.properties
View File

@ -1,24 +0,0 @@
#
# Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 2 only, as
# published by the Free Software Foundation.
#
# This code is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# version 2 for more details (a copy is included in the LICENSE file that
# accompanied this code).
#
# You should have received a copy of the GNU General Public License version
# 2 along with this work; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
# or visit www.oracle.com if you need additional information or have any
# questions.
#
exclusiveAccess.dirs=.

43
test/lib/jdk/test/lib/containers/docker/Common.java
View File

@ -34,14 +34,39 @@ import java.nio.file.StandardCopyOption;
import jdk.test.lib.Utils; import jdk.test.lib.Utils;
import jdk.test.lib.process.OutputAnalyzer; import jdk.test.lib.process.OutputAnalyzer;
import static jdk.test.lib.Asserts.assertNotNull;
public class Common { public class Common {
public static final String imageNameAndTag = "jdk-internal:test"; // Create a unique name for docker image.
public static String imageName() {
// jtreg guarantees that test.name is unique among all concurrently executing
// tests. For example, if you have two test roots:
//
// $ find test -type f
// test/foo/TEST.ROOT
// test/foo/my/TestCase.java
// test/bar/TEST.ROOT
// test/bar/my/TestCase.java
// $ jtreg -concur:2 test/foo test/bar
//
// jtreg will first run all the tests under test/foo. When they are all finished, then
// jtreg will run all the tests under test/bar. So you will never have two concurrent
// test cases whose test.name is "my/TestCase.java"
String testname = System.getProperty("test.name");
assertNotNull(testname, "must be set by jtreg");
testname = testname.replace(".java", "");
testname = testname.replace('/', '-');
testname = testname.replace('\\', '-');
public static String imageName(String suffix) { // Example: "jdk-internal:test-containers-docker-TestMemoryAwareness"
return imageNameAndTag + "-" + suffix; return "jdk-internal:test-" + testname;
} }
public static String imageName(String suffix) {
// Example: "jdk-internal:test-containers-docker-TestMemoryAwareness-memory"
return imageName() + '-' + suffix;
}
public static void prepareWhiteBox() throws Exception { public static void prepareWhiteBox() throws Exception {
Files.copy(Paths.get(new File("whitebox.jar").getAbsolutePath()), Files.copy(Paths.get(new File("whitebox.jar").getAbsolutePath()),
@ -50,20 +75,20 @@ public class Common {
// create simple commonly used options // create simple commonly used options
public static DockerRunOptions newOpts(String imageNameAndTag) { public static DockerRunOptions newOpts(String imageName) {
return new DockerRunOptions(imageNameAndTag, "/jdk/bin/java", "-version") return new DockerRunOptions(imageName, "/jdk/bin/java", "-version")
.addJavaOpts("-Xlog:os+container=trace"); .addJavaOpts("-Xlog:os+container=trace");
} }
public static DockerRunOptions newOptsShowSettings(String imageNameAndTag) { public static DockerRunOptions newOptsShowSettings(String imageName) {
return new DockerRunOptions(imageNameAndTag, "/jdk/bin/java", "-version", "-XshowSettings:system"); return new DockerRunOptions(imageName, "/jdk/bin/java", "-version", "-XshowSettings:system");
} }
// create commonly used options with class to be launched inside container // create commonly used options with class to be launched inside container
public static DockerRunOptions newOpts(String imageNameAndTag, String testClass) { public static DockerRunOptions newOpts(String imageName, String testClass) {
DockerRunOptions opts = DockerRunOptions opts =
new DockerRunOptions(imageNameAndTag, "/jdk/bin/java", testClass); new DockerRunOptions(imageName, "/jdk/bin/java", testClass);
opts.addDockerOpts("--volume", Utils.TEST_CLASSES + ":/test-classes/"); opts.addDockerOpts("--volume", Utils.TEST_CLASSES + ":/test-classes/");
opts.addJavaOpts("-Xlog:os+container=trace", "-cp", "/test-classes/"); opts.addJavaOpts("-Xlog:os+container=trace", "-cp", "/test-classes/");
return opts; return opts;