Skip to content

Commit ff43b66

Browse files
SendaoYanmrserb
SendaoYan
authored andcommitted
8335894: [8u] Fix SupplementalJapaneseEraTest.java for jdks with symlinked conf dir
Reviewed-by: serb
1 parent ff9d068 commit ff43b66

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

jdk/test/java/util/Calendar/SupplementalJapaneseEraTest.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import java.nio.file.SimpleFileVisitor;
4040
import java.nio.file.StandardCopyOption;
4141
import java.nio.file.attribute.BasicFileAttributes;
42+
import java.nio.file.FileVisitOption;
4243
import java.text.SimpleDateFormat;
4344
import java.time.chrono.JapaneseChronology;
4445
import java.time.chrono.JapaneseDate;
@@ -52,6 +53,7 @@
5253
import java.util.Locale;
5354
import java.util.Properties;
5455
import java.util.TimeZone;
56+
import java.util.EnumSet;
5557

5658
import jdk.testlibrary.ProcessTools;
5759
import org.testng.annotations.BeforeTest;
@@ -71,7 +73,7 @@ public class SupplementalJapaneseEraTest {
7173
public void prepareTestJDK() throws IOException {
7274
Path src = Paths.get(System.getProperty("test.jdk")).toAbsolutePath();
7375
Path dst = Paths.get("testjava").toAbsolutePath();
74-
Files.walkFileTree(src, new CopyFileVisitor(src, dst));
76+
Files.walkFileTree(src, EnumSet.of(FileVisitOption.FOLLOW_LINKS), Integer.MAX_VALUE, new CopyFileVisitor(src, dst));
7577
}
7678

7779
@Test

0 commit comments

Comments
 (0)