mirror of
https://github.com/openjdk/jdk.git
synced 2026-02-24 09:10:08 +00:00
8370963: Errors in jpackage jtreg test descriptions
Reviewed-by: almatvee
This commit is contained in:
parent
c6eea8acf6
commit
e293166e44
@ -1,3 +1,6 @@
|
||||
# Assign "jpackagePlatformPackage" key on jpackage tests that output and
|
||||
# optionally install native packages. Don't use the key with tests that output
|
||||
# native packages but will never install them.
|
||||
keys = \
|
||||
jpackagePlatformPackage
|
||||
|
||||
|
||||
@ -69,11 +69,9 @@ import jdk.jpackage.test.TKit;
|
||||
* @test
|
||||
* @summary jpackage with --type image --resource-dir "Info.plist" and "Runtime-Info.plist"
|
||||
* @library /test/jdk/tools/jpackage/helpers
|
||||
* @key jpackagePlatformPackage
|
||||
* @build jdk.jpackage.test.*
|
||||
* @build CustomInfoPListTest
|
||||
* @requires (os.family == "mac")
|
||||
* @requires (jpackage.test.SQETest == null)
|
||||
* @run main/othervm/timeout=1440 -Xmx512m jdk.jpackage.test.Main
|
||||
* --jpt-run=CustomInfoPListTest
|
||||
*/
|
||||
|
||||
@ -38,7 +38,6 @@ import java.util.List;
|
||||
* @test
|
||||
* @summary jpackage with --type dmg --mac-dmg-content
|
||||
* @library /test/jdk/tools/jpackage/helpers
|
||||
* @key jpackagePlatformPackage
|
||||
* @build jdk.jpackage.test.*
|
||||
* @build DmgContentTest
|
||||
* @requires (os.family == "mac")
|
||||
|
||||
@ -47,7 +47,6 @@ import jdk.jpackage.test.Annotations.Test;
|
||||
* @build jdk.jpackage.test.*
|
||||
* @compile -Xlint:all -Werror HostArchPkgTest.java
|
||||
* @requires (os.family == "mac")
|
||||
* @key jpackagePlatformPackage
|
||||
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
|
||||
* --jpt-run=HostArchPkgTest
|
||||
*/
|
||||
|
||||
@ -66,6 +66,7 @@ import jdk.jpackage.test.TKit;
|
||||
* @build jdk.jpackage.test.*
|
||||
* @build SigningPackageTwoStepTest
|
||||
* @requires (jpackage.test.MacSignTests == "run")
|
||||
* @requires (jpackage.test.SQETest == null)
|
||||
* @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main
|
||||
* --jpt-run=SigningPackageTwoStepTest
|
||||
* --jpt-before-run=SigningBase.verifySignTestEnvReady
|
||||
|
||||
@ -80,6 +80,7 @@ import jdk.jpackage.test.TKit;
|
||||
* @build jdk.jpackage.test.*
|
||||
* @build SigningRuntimeImagePackageTest
|
||||
* @requires (jpackage.test.MacSignTests == "run")
|
||||
* @requires (jpackage.test.SQETest == null)
|
||||
* @run main/othervm/timeout=720 -Xmx512m jdk.jpackage.test.Main
|
||||
* --jpt-run=SigningRuntimeImagePackageTest
|
||||
* --jpt-before-run=SigningBase.verifySignTestEnvReady
|
||||
|
||||
@ -40,7 +40,6 @@ import jdk.jpackage.test.Executor;
|
||||
* @test
|
||||
* @summary jpackage with --runtime-image
|
||||
* @library /test/jdk/tools/jpackage/helpers
|
||||
* @key jpackagePlatformPackage
|
||||
* @requires (os.family != "windows")
|
||||
* @build jdk.jpackage.test.*
|
||||
* @compile -Xlint:all -Werror RuntimeImageSymbolicLinksTest.java
|
||||
|
||||
@ -34,7 +34,6 @@ import jdk.jpackage.test.TKit;
|
||||
* @test
|
||||
* @summary jpackage with --runtime-image
|
||||
* @library /test/jdk/tools/jpackage/helpers
|
||||
* @key jpackagePlatformPackage
|
||||
* @build jdk.jpackage.test.*
|
||||
* @compile -Xlint:all -Werror RuntimeImageTest.java
|
||||
* @run main/othervm/timeout=1400 jdk.jpackage.test.Main
|
||||
|
||||
@ -40,7 +40,6 @@ import jdk.jpackage.test.TKit;
|
||||
* @test
|
||||
* @summary jpackage with installer exe from the resource directory
|
||||
* @library /test/jdk/tools/jpackage/helpers
|
||||
* @key jpackagePlatformPackage
|
||||
* @build jdk.jpackage.test.*
|
||||
* @compile -Xlint:all -Werror WinInstallerResourceTest.java
|
||||
* @requires (os.family == "windows")
|
||||
|
||||
@ -40,7 +40,6 @@ import jdk.jpackage.test.TKit;
|
||||
* @bug 8289771
|
||||
* @summary jpackage with long paths on windows
|
||||
* @library /test/jdk/tools/jpackage/helpers
|
||||
* @key jpackagePlatformPackage
|
||||
* @build jdk.jpackage.test.*
|
||||
* @requires (os.family == "windows")
|
||||
* @compile -Xlint:all -Werror WinLongPathTest.java
|
||||
|
||||
@ -66,19 +66,6 @@ import org.w3c.dom.NodeList;
|
||||
* scenario must be uninstalled
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @summary jpackage with long version number
|
||||
* @library /test/jdk/tools/jpackage/helpers
|
||||
* @key jpackagePlatformPackage
|
||||
* @requires (jpackage.test.SQETest != null)
|
||||
* @build jdk.jpackage.test.*
|
||||
* @requires (os.family == "windows")
|
||||
* @compile -Xlint:all -Werror WinLongVersionTest.java
|
||||
* @run main/othervm/timeout=540 -Xmx512m jdk.jpackage.test.Main
|
||||
* --jpt-run=WinLongVersionTest.test
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @summary jpackage with long version number
|
||||
|
||||
@ -34,11 +34,9 @@ import jdk.jpackage.test.TKit;
|
||||
* @test
|
||||
* @summary jpackage test that installer blocks on Windows of older version
|
||||
* @library /test/jdk/tools/jpackage/helpers
|
||||
* @key jpackagePlatformPackage
|
||||
* @build jdk.jpackage.test.*
|
||||
* @compile -Xlint:all -Werror WinOSConditionTest.java
|
||||
* @requires (os.family == "windows")
|
||||
* @requires (jpackage.test.SQETest == null)
|
||||
* @run main/othervm/timeout=360 -Xmx512m jdk.jpackage.test.Main
|
||||
* --jpt-run=WinOSConditionTest
|
||||
*/
|
||||
|
||||
@ -33,7 +33,6 @@ import jdk.jpackage.test.Annotations.Test;
|
||||
* @test
|
||||
* @summary jpackage test app can run after changing executable's extension
|
||||
* @library /test/jdk/tools/jpackage/helpers
|
||||
* @key jpackagePlatformPackage
|
||||
* @build jdk.jpackage.test.*
|
||||
* @build WinRenameTest
|
||||
* @requires (os.family == "windows")
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user