SapMachine SAP#1823: Fix some tools tests after adding asprof

(cherry picked from commit a92d841)
RealCLanger · Oct 8, 2024 · 04384f3 · 04384f3
1 parent 844db49
commit 04384f3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/test/jdk/TEST.groups b/test/jdk/TEST.groups
@@ -66,7 +66,9 @@ tier1_sapmachine = \
     java/util/jar/Manifest/IncludeInExceptionsTest.java \
     jdk/security/JavaDotSecurity/TestJDKIncludeInExceptions.java \
     sun/net/www/http/KeepAliveCache/TestConnectionIDFeature.java \
-    sun/security/lib/cacerts/VerifyCACerts.java
+    sun/security/lib/cacerts/VerifyCACerts.java \
+    tools/launcher/HelpFlagsTest.java \
+    tools/launcher/VersionCheck.java
 
 # When adding tests to tier2, make sure they end up in one of the tier2_partX groups
 tier2 = \

diff --git a/test/jdk/tools/launcher/HelpFlagsTest.java b/test/jdk/tools/launcher/HelpFlagsTest.java
@@ -64,7 +64,9 @@ public class HelpFlagsTest extends TestHelper {
         "jmc",
         "jweblauncher",
         "jcontrol",
-        "ssvagent"
+        "ssvagent",
+        // SapMachine 2024-10-07: asprof was added on some platforms but has different command line flags
+        "asprof"
     };
 
     // Lists which tools support which flags.

diff --git a/test/jdk/tools/launcher/VersionCheck.java b/test/jdk/tools/launcher/VersionCheck.java
@@ -62,7 +62,9 @@ public class VersionCheck extends TestHelper {
         "jweblauncher",
         "jpackage",
         "ssvagent",
-        "jwebserver"
+        "jwebserver",
+        // SapMachine 2024-10-07: asprof was added on some platforms but has different command line flags
+        "asprof"
     };
 
     // tools that do not accept -version
@@ -108,7 +110,9 @@ public class VersionCheck extends TestHelper {
         "rmiregistry",
         "serialver",
         "servertool",
-        "ssvagent"
+        "ssvagent",
+        // SapMachine 2024-10-07: asprof was added on some platforms but has different command line flags
+        "asprof"
     };
 
     // expected reference strings