From 433ede74070957c14e4d616b586802357941b32f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20B=C3=A4sken?= <MBaesken@users.noreply.github.com>
Date: Tue, 8 Oct 2024 10:38:25 +0200
Subject: [PATCH] SapMachine #1823: Fix some tools tests after adding asprof

(cherry picked from commit a92d84111679254b6466a9d1a762bbc8d8368fee)
---
 test/jdk/TEST.groups                       | 4 +++-
 test/jdk/tools/launcher/HelpFlagsTest.java | 4 +++-
 test/jdk/tools/launcher/VersionCheck.java  | 8 ++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/test/jdk/TEST.groups b/test/jdk/TEST.groups
index d0b50a665f6..123c131dd35 100644
--- a/test/jdk/TEST.groups
+++ b/test/jdk/TEST.groups
@@ -63,7 +63,9 @@ tier1_sapmachine = \
     java/net/Socket/ExceptionText.java \
     java/util/jar/Manifest/IncludeInExceptionsTest.java \
     jdk/security/JavaDotSecurity/TestJDKIncludeInExceptions.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
index 173074ab905..f67bd591c94 100644
--- 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
index 38a61b54198..c81727caa9b 100644
--- a/test/jdk/tools/launcher/VersionCheck.java
+++ b/test/jdk/tools/launcher/VersionCheck.java
@@ -61,7 +61,9 @@ public class VersionCheck extends TestHelper {
         "jmc.ini",
         "jweblauncher",
         "jpackage",
-        "ssvagent"
+        "ssvagent",
+        // SapMachine 2024-10-07: asprof was added on some platforms but has different command line flags
+        "asprof"
     };
 
     // tools that do not accept -version
@@ -107,7 +109,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