stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8320706: RuntimePackageTest.testUsrInstallDir test fails on Linux

Browse Source 
Reviewed-by: almatvee
This commit is contained in:
Alexey Semenyuk 2023-11-27 22:20:43 +00:00
parent 1bb250c9e6
commit 726f854b14
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/jdk/tools/jpackage/helpers/jdk/jpackage/test/JPackageCommand.java
View File

@ -888,10 +888,17 @@ public final class JPackageCommand extends CommandArguments<JPackageCommand> {
final Path rootDir = isImagePackageType() ? outputBundle() : pathToUnpackedPackageFile(
appInstallationDirectory());
try ( Stream<Path> walk = ThrowingSupplier.toSupplier(() -> Files.walk(
rootDir)).get()) {
List<String> files = walk.filter(path -> path.getFileName().equals(
filename)).map(Path::toString).toList();
try ( Stream<Path> walk = ThrowingSupplier.toSupplier(() -> {
if (TKit.isLinux() && rootDir.equals(Path.of("/"))) {
// Installed package with split app image on Linux. Iterate
// through package file list instead of the entire file system.
return LinuxHelper.getPackageFiles(this);
} else {
return Files.walk(rootDir);
}
}).get()) {
List<String> files = walk.filter(path -> filename.equals(
path.getFileName())).map(Path::toString).toList();
if (expectedPath == null) {
TKit.assertStringListEquals(List.of(), files, String.format(