From 4d1e313b70df1d2a91d1e078c2fd585f80fc1c75 Mon Sep 17 00:00:00 2001 From: sendaoYan Date: Mon, 8 Jul 2024 14:55:03 +0800 Subject: [PATCH 1/3] Backport c1bb926f4d5eaf49777f93b9f8788db243bba83b --- test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java b/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java index c8f86bc4c0d..dc3baaeefe7 100644 --- a/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java +++ b/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java @@ -30,12 +30,14 @@ import java.nio.file.FileVisitResult; import java.nio.file.Path; import java.nio.file.Paths; +import java.nio.file.FileVisitOption; import java.nio.file.SimpleFileVisitor; import java.nio.file.StandardCopyOption; import java.nio.file.attribute.BasicFileAttributes; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.EnumSet; import jdk.test.lib.Container; import jdk.test.lib.Utils; import jdk.test.lib.process.OutputAnalyzer; @@ -145,7 +147,7 @@ private static boolean isDockerEngineAvailableCheck() throws Exception { // Copy JDK-under-test tree to the docker build directory. // This step is required for building a docker image. - Files.walkFileTree(jdkSrcDir, new CopyFileVisitor(jdkSrcDir, jdkDstDir)); + Files.walkFileTree(jdkSrcDir, EnumSet.of(FileVisitOption.FOLLOW_LINKS), Integer.MAX_VALUE, new CopyFileVisitor(jdkSrcDir, jdkDstDir)); buildDockerImage(imageName, Paths.get(Utils.TEST_SRC, dockerfile), buildDir); } From 08e5aac2e8d8eb445caa59ada2b423b07a25c365 Mon Sep 17 00:00:00 2001 From: sendaoYan Date: Tue, 20 Aug 2024 23:42:42 +0800 Subject: [PATCH 2/3] include the same change in the Hotspot copy of DockerTestUtils.java --- .../com/oracle/java/testlibrary/DockerTestUtils.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hotspot/test/testlibrary/com/oracle/java/testlibrary/DockerTestUtils.java b/hotspot/test/testlibrary/com/oracle/java/testlibrary/DockerTestUtils.java index b0d2f6ce9f2..3e6bcbd5842 100644 --- a/hotspot/test/testlibrary/com/oracle/java/testlibrary/DockerTestUtils.java +++ b/hotspot/test/testlibrary/com/oracle/java/testlibrary/DockerTestUtils.java @@ -30,12 +30,14 @@ import java.nio.file.FileVisitResult; import java.nio.file.Path; import java.nio.file.Paths; +import java.nio.file.FileVisitOption; import java.nio.file.SimpleFileVisitor; import java.nio.file.StandardCopyOption; import java.nio.file.attribute.BasicFileAttributes; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.EnumSet; import com.oracle.java.testlibrary.Utils; import com.oracle.java.testlibrary.Container; From a89176e637fd7f0ca365d31afaf0ffd7430ba2f1 Mon Sep 17 00:00:00 2001 From: sendaoYan Date: Tue, 20 Aug 2024 23:45:14 +0800 Subject: [PATCH 3/3] include the same change in the Hotspot copy of DockerTestUtils.java --- .../com/oracle/java/testlibrary/DockerTestUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hotspot/test/testlibrary/com/oracle/java/testlibrary/DockerTestUtils.java b/hotspot/test/testlibrary/com/oracle/java/testlibrary/DockerTestUtils.java index 3e6bcbd5842..366ba2b2a13 100644 --- a/hotspot/test/testlibrary/com/oracle/java/testlibrary/DockerTestUtils.java +++ b/hotspot/test/testlibrary/com/oracle/java/testlibrary/DockerTestUtils.java @@ -146,7 +146,7 @@ private static boolean isDockerEngineAvailableCheck() throws Exception { // Copy JDK-under-test tree to the docker build directory. // This step is required for building a docker image. - Files.walkFileTree(jdkSrcDir, new CopyFileVisitor(jdkSrcDir, jdkDstDir)); + Files.walkFileTree(jdkSrcDir, EnumSet.of(FileVisitOption.FOLLOW_LINKS), Integer.MAX_VALUE, new CopyFileVisitor(jdkSrcDir, jdkDstDir)); buildDockerImage(imageName, Paths.get(Utils.TEST_SRC, dockerfile), buildDir); }