Skip to content

Commit c1bb926

Browse files
zzambersjerboaa
authored andcommitted
8309138: Fix container tests for jdks with symlinked conf dir
Backport-of: ec55539534d43629c1a47407a8e2e94913034a71
1 parent 3bc72d0 commit c1bb926

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import java.io.FileWriter;
2828
import java.io.IOException;
2929
import java.nio.file.Files;
30+
import java.nio.file.FileVisitOption;
3031
import java.nio.file.FileVisitResult;
3132
import java.nio.file.Path;
3233
import java.nio.file.Paths;
@@ -36,6 +37,7 @@
3637
import java.util.Arrays;
3738
import java.util.ArrayList;
3839
import java.util.Collections;
40+
import java.util.EnumSet;
3941
import java.util.List;
4042
import jdk.test.lib.Container;
4143
import jdk.test.lib.Utils;
@@ -164,7 +166,7 @@ public static void buildJdkContainerImage(String imageName, String dockerfileCon
164166
Path jdkSrcDir = Paths.get(JDK_UNDER_TEST);
165167
Path jdkDstDir = buildDir.resolve("jdk");
166168
Files.createDirectories(jdkDstDir);
167-
Files.walkFileTree(jdkSrcDir, new CopyFileVisitor(jdkSrcDir, jdkDstDir));
169+
Files.walkFileTree(jdkSrcDir, EnumSet.of(FileVisitOption.FOLLOW_LINKS), Integer.MAX_VALUE, new CopyFileVisitor(jdkSrcDir, jdkDstDir));
168170

169171
buildImage(imageName, buildDir);
170172
}

0 commit comments

Comments
 (0)