infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-14 18:03:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

8228434: jdk/net/Sockets/Test.java fails after JDK-8227642

Browse Source 
Move container constant to separate test lib class

Reviewed-by: alanb
This commit is contained in:
Severin Gehwolf 2019-07-22 10:48:14 +02:00
parent 422e04e98f
commit 843ee2be16
6 changed files with 45 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,7 +35,9 @@ groups=TEST.groups TEST.quick-groups
# to determine additional characteristics of the system for use with the @requires tag.
# Note: compiled bootlibs code will be located in the folder 'bootClasses'
requires.extraPropDefns = ../../jtreg-ext/requires/VMProps.java
requires.extraPropDefns.bootlibs = ../../lib/sun ../../lib/jdk/test/lib/Platform.java
requires.extraPropDefns.bootlibs = ../../lib/sun \
../../lib/jdk/test/lib/Platform.java \
../../lib/jdk/test/lib/Container.java
requires.extraPropDefns.vmOpts = -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:bootClasses
requires.properties= \
sun.arch.data.model \

4
test/jdk/TEST.ROOT
View File

@ -37,7 +37,9 @@ groups=TEST.groups
# to determine additional characteristics of the system for use with the @requires tag.
# Note: compiled bootlibs code will be located in the folder 'bootClasses'
requires.extraPropDefns = ../jtreg-ext/requires/VMProps.java
requires.extraPropDefns.bootlibs = ../lib/sun ../lib/jdk/test/lib/Platform.java
requires.extraPropDefns.bootlibs = ../lib/sun \
../lib/jdk/test/lib/Platform.java \
../lib/jdk/test/lib/Container.java
requires.extraPropDefns.vmOpts = -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:bootClasses
requires.properties= \
sun.arch.data.model \

3
test/jtreg-ext/requires/VMProps.java
View File

@ -46,6 +46,7 @@ import sun.hotspot.cpuinfo.CPUInfo;
import sun.hotspot.gc.GC;
import sun.hotspot.WhiteBox;
import jdk.test.lib.Platform;
import jdk.test.lib.Container;
/**
* The Class to be invoked by jtreg prior Test Suite execution to
@ -455,7 +456,7 @@ public class VMProps implements Callable<Map<String, String>> {
}
private boolean checkDockerSupport() throws IOException, InterruptedException {
ProcessBuilder pb = new ProcessBuilder(Platform.DOCKER_COMMAND, "ps");
ProcessBuilder pb = new ProcessBuilder(Container.ENGINE_COMMAND, "ps");
Process p = pb.start();
p.waitFor(10, TimeUnit.SECONDS);

32
test/lib/jdk/test/lib/Container.java Normal file
View File

@ -0,0 +1,32 @@
/*
* Copyright (c) 2019, Red Hat Inc.
* 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.
*/
package jdk.test.lib;
public class Container {
// Use this property to specify docker location on your system.
// E.g.: "/usr/local/bin/docker". We define this constant here so
// that it can be used in VMProps as well which checks docker support
// via this command
public static final String ENGINE_COMMAND =
System.getProperty("jdk.test.container.command", "docker");
}

6
test/lib/jdk/test/lib/Platform.java
View File

@ -33,12 +33,6 @@ import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
public class Platform {
// Use this property to specify docker location on your system.
// E.g.: "/usr/local/bin/docker". We define this constant here so
// that it can be used in VMProps as well which checks docker support
// via this command
public static final String DOCKER_COMMAND =
System.getProperty("jdk.test.docker.command", "docker");
public static final String vmName = privilegedGetProperty("java.vm.name");
public static final String vmInfo = privilegedGetProperty("java.vm.info");
private static final String osVersion = privilegedGetProperty("os.version");

10
test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java
View File

@ -37,7 +37,7 @@ import java.util.Arrays;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import jdk.test.lib.Platform;
import jdk.test.lib.Container;
import jdk.test.lib.Utils;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
@ -112,7 +112,7 @@ public class DockerTestUtils {
*/
private static boolean isDockerEngineAvailableCheck() throws Exception {
try {
execute(Platform.DOCKER_COMMAND, "ps")
execute(Container.ENGINE_COMMAND, "ps")
.shouldHaveExitValue(0)
.shouldContain("CONTAINER")
.shouldContain("IMAGE");
@ -175,7 +175,7 @@ public class DockerTestUtils {
DockerfileConfig.getBaseImageVersion());
try {
// Build the docker
execute(Platform.DOCKER_COMMAND, "build", "--no-cache", "--tag", imageName, buildDir.toString())
execute(Container.ENGINE_COMMAND, "build", "--no-cache", "--tag", imageName, buildDir.toString())
.shouldHaveExitValue(0);
} catch (Exception e) {
// If docker image building fails there is a good chance it happens due to environment and/or
@ -197,7 +197,7 @@ public class DockerTestUtils {
public static List<String> buildJavaCommand(DockerRunOptions opts) throws Exception {
List<String> cmd = new ArrayList<>();
cmd.add(Platform.DOCKER_COMMAND);
cmd.add(Container.ENGINE_COMMAND);
cmd.add("run");
if (opts.tty)
cmd.add("--tty=true");
@ -239,7 +239,7 @@ public class DockerTestUtils {
* @throws Exception
*/
public static void removeDockerImage(String imageNameAndTag) throws Exception {
execute(Platform.DOCKER_COMMAND, "rmi", "--force", imageNameAndTag);
execute(Container.ENGINE_COMMAND, "rmi", "--force", imageNameAndTag);
}