From 61cbf0fffeb2b84e5092ae9873ef6b40e489381f Mon Sep 17 00:00:00 2001 From: Alexey Semenyuk Date: Thu, 17 Dec 2020 15:33:03 +0000 Subject: [PATCH] 8258293: tools/jpackage/share/RuntimePackageTest.java#id0 with RuntimePackageTest.testUsrInstallDir2 Reviewed-by: almatvee, herrick --- test/jdk/tools/jpackage/share/RuntimePackageTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/jdk/tools/jpackage/share/RuntimePackageTest.java b/test/jdk/tools/jpackage/share/RuntimePackageTest.java index 9c4c24e3dcb..9f7f61eeb15 100644 --- a/test/jdk/tools/jpackage/share/RuntimePackageTest.java +++ b/test/jdk/tools/jpackage/share/RuntimePackageTest.java @@ -126,7 +126,11 @@ public class RuntimePackageTest { private static Set 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()); } }