From 3c99e786ab4f89448f8d2a6eaf532255a8a560bf Mon Sep 17 00:00:00 2001 From: Alexey Semenyuk Date: Tue, 10 Jan 2023 18:02:34 +0000 Subject: [PATCH] 8298735: Some tools/jpackage/windows/* tests fails with jtreg test timeout Reviewed-by: almatvee --- test/jdk/tools/jpackage/windows/WinDirChooserTest.java | 2 +- test/jdk/tools/jpackage/windows/WinInstallerIconTest.java | 2 +- test/jdk/tools/jpackage/windows/WinInstallerUiTest.java | 2 +- test/jdk/tools/jpackage/windows/WinMenuGroupTest.java | 2 +- test/jdk/tools/jpackage/windows/WinMenuTest.java | 2 +- test/jdk/tools/jpackage/windows/WinPerUserInstallTest.java | 2 +- test/jdk/tools/jpackage/windows/WinScriptTest.java | 2 +- test/jdk/tools/jpackage/windows/WinShortcutPromptTest.java | 2 +- test/jdk/tools/jpackage/windows/WinShortcutTest.java | 2 +- test/jdk/tools/jpackage/windows/WinUrlTest.java | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/jdk/tools/jpackage/windows/WinDirChooserTest.java b/test/jdk/tools/jpackage/windows/WinDirChooserTest.java index 2c5384f3561..355b89dba3e 100644 --- a/test/jdk/tools/jpackage/windows/WinDirChooserTest.java +++ b/test/jdk/tools/jpackage/windows/WinDirChooserTest.java @@ -42,7 +42,7 @@ import jdk.jpackage.test.PackageType; * @build WinDirChooserTest * @requires (os.family == "windows") * @modules jdk.jpackage/jdk.jpackage.internal - * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main + * @run main/othervm/timeout=540 -Xmx512m jdk.jpackage.test.Main * --jpt-run=WinDirChooserTest */ diff --git a/test/jdk/tools/jpackage/windows/WinInstallerIconTest.java b/test/jdk/tools/jpackage/windows/WinInstallerIconTest.java index 450a98a40f4..63194d6b256 100644 --- a/test/jdk/tools/jpackage/windows/WinInstallerIconTest.java +++ b/test/jdk/tools/jpackage/windows/WinInstallerIconTest.java @@ -44,7 +44,7 @@ import jdk.jpackage.test.TKit; * @build WinInstallerIconTest * @requires (os.family == "windows") * @modules jdk.jpackage/jdk.jpackage.internal - * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main + * @run main/othervm/timeout=540 -Xmx512m jdk.jpackage.test.Main * --jpt-run=WinInstallerIconTest */ diff --git a/test/jdk/tools/jpackage/windows/WinInstallerUiTest.java b/test/jdk/tools/jpackage/windows/WinInstallerUiTest.java index c6631bc008a..99c6eb490d5 100644 --- a/test/jdk/tools/jpackage/windows/WinInstallerUiTest.java +++ b/test/jdk/tools/jpackage/windows/WinInstallerUiTest.java @@ -45,7 +45,7 @@ import jdk.jpackage.test.TKit; * @build WinInstallerUiTest * @requires (os.family == "windows") * @modules jdk.jpackage/jdk.jpackage.internal - * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main + * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main * --jpt-run=WinInstallerUiTest */ public class WinInstallerUiTest { diff --git a/test/jdk/tools/jpackage/windows/WinMenuGroupTest.java b/test/jdk/tools/jpackage/windows/WinMenuGroupTest.java index b8b748a6ca1..5950418f609 100644 --- a/test/jdk/tools/jpackage/windows/WinMenuGroupTest.java +++ b/test/jdk/tools/jpackage/windows/WinMenuGroupTest.java @@ -45,7 +45,7 @@ import jdk.jpackage.test.Annotations.Test; * @requires (os.family == "windows") * @modules jdk.jpackage/jdk.jpackage.internal * @compile WinMenuGroupTest.java - * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main + * @run main/othervm/timeout=540 -Xmx512m jdk.jpackage.test.Main * --jpt-run=WinMenuGroupTest */ diff --git a/test/jdk/tools/jpackage/windows/WinMenuTest.java b/test/jdk/tools/jpackage/windows/WinMenuTest.java index e39a16465fe..a28d28e24ec 100644 --- a/test/jdk/tools/jpackage/windows/WinMenuTest.java +++ b/test/jdk/tools/jpackage/windows/WinMenuTest.java @@ -42,7 +42,7 @@ import jdk.jpackage.test.Annotations.Test; * @requires (os.family == "windows") * @modules jdk.jpackage/jdk.jpackage.internal * @compile WinMenuTest.java - * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main + * @run main/othervm/timeout=540 -Xmx512m jdk.jpackage.test.Main * --jpt-run=WinMenuTest */ diff --git a/test/jdk/tools/jpackage/windows/WinPerUserInstallTest.java b/test/jdk/tools/jpackage/windows/WinPerUserInstallTest.java index 2020c27975b..5d97bb9357e 100644 --- a/test/jdk/tools/jpackage/windows/WinPerUserInstallTest.java +++ b/test/jdk/tools/jpackage/windows/WinPerUserInstallTest.java @@ -43,7 +43,7 @@ import jdk.jpackage.test.Annotations.Test; * @requires (os.family == "windows") * @modules jdk.jpackage/jdk.jpackage.internal * @compile WinPerUserInstallTest.java - * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main + * @run main/othervm/timeout=540 -Xmx512m jdk.jpackage.test.Main * --jpt-run=WinPerUserInstallTest */ diff --git a/test/jdk/tools/jpackage/windows/WinScriptTest.java b/test/jdk/tools/jpackage/windows/WinScriptTest.java index 5e8c00bbddb..775102cd014 100644 --- a/test/jdk/tools/jpackage/windows/WinScriptTest.java +++ b/test/jdk/tools/jpackage/windows/WinScriptTest.java @@ -42,7 +42,7 @@ import jdk.jpackage.test.JPackageCommand; * @requires (os.family == "windows") * @modules jdk.jpackage/jdk.jpackage.internal * @compile WinScriptTest.java - * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main + * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main * --jpt-run=WinScriptTest */ diff --git a/test/jdk/tools/jpackage/windows/WinShortcutPromptTest.java b/test/jdk/tools/jpackage/windows/WinShortcutPromptTest.java index 33d9a661ca3..6c27b6852eb 100644 --- a/test/jdk/tools/jpackage/windows/WinShortcutPromptTest.java +++ b/test/jdk/tools/jpackage/windows/WinShortcutPromptTest.java @@ -43,7 +43,7 @@ import jdk.jpackage.test.PackageType; * @build WinShortcutPromptTest * @requires (os.family == "windows") * @modules jdk.jpackage/jdk.jpackage.internal - * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main + * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main * --jpt-run=WinShortcutPromptTest */ public class WinShortcutPromptTest { diff --git a/test/jdk/tools/jpackage/windows/WinShortcutTest.java b/test/jdk/tools/jpackage/windows/WinShortcutTest.java index f50f07a8905..3efa8b68817 100644 --- a/test/jdk/tools/jpackage/windows/WinShortcutTest.java +++ b/test/jdk/tools/jpackage/windows/WinShortcutTest.java @@ -43,7 +43,7 @@ import jdk.jpackage.test.Annotations.Test; * @requires (os.family == "windows") * @modules jdk.jpackage/jdk.jpackage.internal * @compile WinShortcutTest.java - * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main + * @run main/othervm/timeout=540 -Xmx512m jdk.jpackage.test.Main * --jpt-run=WinShortcutTest */ diff --git a/test/jdk/tools/jpackage/windows/WinUrlTest.java b/test/jdk/tools/jpackage/windows/WinUrlTest.java index 8e1ffad8570..208d16d931a 100644 --- a/test/jdk/tools/jpackage/windows/WinUrlTest.java +++ b/test/jdk/tools/jpackage/windows/WinUrlTest.java @@ -46,7 +46,7 @@ import jdk.jpackage.test.PackageType; * @build WinUrlTest * @requires (os.family == "windows") * @modules jdk.jpackage/jdk.jpackage.internal - * @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main + * @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main * --jpt-run=WinUrlTest */ public class WinUrlTest {