8278233: [macos] tools/jpackage tests timeout due to /usr/bin/osascript

Alexander Matveev · Alexander Matveev · commit 918e3397858c · 2021-12-14T23:59:11.000Z
Reviewed-by: herrick, asemenyuk
diff --git a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/IOUtils.java b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/IOUtils.java
@@ -191,7 +191,7 @@ static void exec(ProcessBuilder pb, boolean testForPresenceOnly,
             PrintStream consumer, boolean writeOutputToFile, long timeout)
             throws IOException {
         exec(pb, testForPresenceOnly, consumer, writeOutputToFile,
-                Executor.INFINITE_TIMEOUT, false);
+                timeout, false);
     }
 
     static void exec(ProcessBuilder pb, boolean testForPresenceOnly,
diff --git a/test/jdk/ProblemList.txt b/test/jdk/ProblemList.txt
@@ -834,9 +834,6 @@ jdk/jfr/api/consumer/streaming/TestLatestEvent.java             8268297 windows-
 
 # jdk_jpackage
 
-tools/jpackage/share/IconTest.java 8278233 macosx-x64
-tools/jpackage/share/MultiNameTwoPhaseTest.java 8278233 macosx-x64
-
 ############################################################################
 
 # Client manual tests

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ static void exec(ProcessBuilder pb, boolean testForPresenceOnly,`
`191`	`191`	`PrintStream consumer, boolean writeOutputToFile, long timeout)`
`192`	`192`	`throws IOException {`
`193`	`193`	`exec(pb, testForPresenceOnly, consumer, writeOutputToFile,`
`194`		`- Executor.INFINITE_TIMEOUT, false);`
	`194`	`+ timeout, false);`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`static void exec(ProcessBuilder pb, boolean testForPresenceOnly,`