commit 61cbf0fffeb2b84e5092ae9873ef6b40e489381f
author Alexey Semenyuk <asemenyuk@openjdk.org> Thu Dec 17 15:33:03 2020 +0000
committer Alexey Semenyuk <asemenyuk@openjdk.org> Thu Dec 17 15:33:03 2020 +0000
tree b88d87267488eaead7f983c1759ead8856cf84e9
parent 7aac4dc17573b7df2af8aa3d1f01add56b30ad02

8258293: tools/jpackage/share/RuntimePackageTest.java#id0 with RuntimePackageTest.testUsrInstallDir2

Reviewed-by: almatvee, herrick

test/jdk/tools/jpackage/share/RuntimePackageTest.java

diff --git a/test/jdk/tools/jpackage/share/RuntimePackageTest.java b/test/jdk/tools/jpackage/share/RuntimePackageTest.java
index 9c4c24e..9f7f61e 100644
--- a/test/jdk/tools/jpackage/share/RuntimePackageTest.java
+++ b/test/jdk/tools/jpackage/share/RuntimePackageTest.java
@@ -126,7 +126,11 @@
 
     private static Set<Path> listFiles(Path root) throws IOException {
         try (var files = Files.walk(root)) {
-            return files.map(root::relativize).collect(Collectors.toSet());
+            // Ignore files created by system prefs if any.
+            final Path prefsDir = Path.of(".systemPrefs");
+            return files.map(root::relativize)
+                    .filter(x -> !x.startsWith(prefsDir))
+                    .collect(Collectors.toSet());
         }
     }