Skip to content

Commit ec55539

Browse files
zzambersjerboaa
authored andcommitted
8309138: Fix container tests for jdks with symlinked conf dir
Reviewed-by: sgehwolf
1 parent e827164 commit ec55539

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
@@ -26,6 +26,7 @@
2626
import java.io.FileWriter;
2727
import java.io.IOException;
2828
import java.nio.file.Files;
29+
import java.nio.file.FileVisitOption;
2930
import java.nio.file.FileVisitResult;
3031
import java.nio.file.Path;
3132
import java.nio.file.Paths;
@@ -35,6 +36,7 @@
3536
import java.util.Arrays;
3637
import java.util.ArrayList;
3738
import java.util.Collections;
39+
import java.util.EnumSet;
3840
import java.util.List;
3941
import jdk.test.lib.Container;
4042
import jdk.test.lib.Utils;
@@ -163,7 +165,7 @@ public static void buildJdkContainerImage(String imageName, String dockerfileCon
163165
Path jdkSrcDir = Paths.get(JDK_UNDER_TEST);
164166
Path jdkDstDir = buildDir.resolve("jdk");
165167
Files.createDirectories(jdkDstDir);
166-
Files.walkFileTree(jdkSrcDir, new CopyFileVisitor(jdkSrcDir, jdkDstDir));
168+
Files.walkFileTree(jdkSrcDir, EnumSet.of(FileVisitOption.FOLLOW_LINKS), Integer.MAX_VALUE, new CopyFileVisitor(jdkSrcDir, jdkDstDir));
167169

168170
buildImage(imageName, buildDir);
169171
}

0 commit comments

Comments
 (0)