8221527: [TESTBUG] DockerBasicTest.java contains hard-coded reference to JDK 10
Using Docker test library to get the image name Reviewed-by: dholmes
This commit is contained in:
parent
df4f28c041
commit
ea59f49e55
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
|
* Copyright (c) 2017, 2019, 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
|
||||||
@ -33,6 +33,7 @@
|
|||||||
* @build HelloDocker
|
* @build HelloDocker
|
||||||
* @run driver DockerBasicTest
|
* @run driver DockerBasicTest
|
||||||
*/
|
*/
|
||||||
|
import jdk.test.lib.containers.docker.Common;
|
||||||
import jdk.test.lib.containers.docker.DockerRunOptions;
|
import jdk.test.lib.containers.docker.DockerRunOptions;
|
||||||
import jdk.test.lib.containers.docker.DockerTestUtils;
|
import jdk.test.lib.containers.docker.DockerTestUtils;
|
||||||
import jdk.test.lib.Platform;
|
import jdk.test.lib.Platform;
|
||||||
@ -40,7 +41,7 @@ import jdk.test.lib.Utils;
|
|||||||
|
|
||||||
|
|
||||||
public class DockerBasicTest {
|
public class DockerBasicTest {
|
||||||
private static final String imageNameAndTag = "jdk10-internal:test";
|
private static final String imageNameAndTag = Common.imageName("basic");
|
||||||
// Diganostics: set to false to examine image after the test
|
// Diganostics: set to false to examine image after the test
|
||||||
private static final boolean removeImageAfterTest = true;
|
private static final boolean removeImageAfterTest = true;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user