8370963: Errors in jpackage jtreg test descriptions

Reviewed-by: almatvee

Author: Alexey Semenyuk

test/jdk/tools/jpackage/TEST.properties

@@ -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
 

test/jdk/tools/jpackage/macosx/CustomInfoPListTest.java

@@ -69,11 +69,9 @@
  * @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
  */

test/jdk/tools/jpackage/macosx/DmgContentTest.java

@@ -38,7 +38,6 @@
  * @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")

test/jdk/tools/jpackage/macosx/HostArchPkgTest.java

@@ -47,7 +47,6 @@
  * @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
  */

test/jdk/tools/jpackage/macosx/SigningPackageTwoStepTest.java

@@ -66,6 +66,7 @@
  * @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

test/jdk/tools/jpackage/macosx/SigningRuntimeImagePackageTest.java

@@ -80,6 +80,7 @@
  * @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

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

@@ -40,7 +40,6 @@
  * @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

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

@@ -34,7 +34,6 @@
  * @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

test/jdk/tools/jpackage/windows/WinInstallerResourceTest.java

@@ -40,7 +40,6 @@
  * @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")

test/jdk/tools/jpackage/windows/WinLongPathTest.java

@@ -40,7 +40,6 @@
  * @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