Skip to content

Commit fa7c5a6

Browse files
author
Alexander Matveev
committed
8356664: [macos] AppContentTest fails after JDK-8352480
Reviewed-by: asemenyuk
1 parent 3b336a9 commit fa7c5a6

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,13 +162,16 @@ private static Path copyAppContentPath(Path appContentPath) throws IOException {
162162

163163
private static Path createAppContentLink(Path appContentPath) throws IOException {
164164
var appContentArg = TKit.createTempDirectory("app-content");
165+
Path dstPath;
165166
if (copyInResources) {
166-
appContentArg = appContentArg.resolve(RESOURCES_DIR).resolve(LINKS_DIR);
167-
} else {
167+
appContentArg = appContentArg.resolve(RESOURCES_DIR);
168+
dstPath = appContentArg.resolve(LINKS_DIR)
169+
.resolve(appContentPath.getFileName());
170+
} else {
168171
appContentArg = appContentArg.resolve(LINKS_DIR);
172+
dstPath = appContentArg.resolve(appContentPath.getFileName());
169173
}
170174

171-
var dstPath = appContentArg.resolve(appContentPath.getFileName());
172175
Files.createDirectories(dstPath.getParent());
173176

174177
// Create target file for a link

0 commit comments

Comments
 (0)