From 5ed246d17d9f40489ed715b7df104ec6a832841e Mon Sep 17 00:00:00 2001
From: Matthew Donovan <mdonovan@openjdk.org>
Date: Wed, 4 Jun 2025 18:07:07 +0000
Subject: [PATCH] 8357592: Update output parsing in
 test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java

Reviewed-by: rhalade
---
 .../tools/jarsigner/compatibility/Compatibility.java        | 6 +++---
 test/jdk/sun/security/tools/jarsigner/warnings/Test.java    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java b/test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java
index 3be1e74d972..25bb67c230b 100644
--- a/test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java
+++ b/test/jdk/sun/security/tools/jarsigner/compatibility/Compatibility.java
@@ -516,7 +516,7 @@ public class Compatibility {
             String line;
             while ((line = reader.readLine()) != null) {
                 String item = line.trim();
-                if (!item.isEmpty()) {
+                if (!item.isEmpty() && !item.startsWith("#")) {
                     list.add(item);
                 }
             }
@@ -718,8 +718,8 @@ public class Compatibility {
             String match = "^  ("
                     + "  Signature algorithm: " + signItem.certInfo.
                             expectedSigalg(signItem) + ", " + signItem.certInfo.
-                            expectedKeySize() + "-bit " + signItem.certInfo.
-                            expectedKeyAlgorithm() + " key"
+                            expectedKeySize() + "-bit (" + signItem.certInfo.
+                            expectedKeyAlgorithm() + " key|key)"
                     + ")|("
                     + "  Digest algorithm: " + signItem.expectedDigestAlg()
                     + (isWeakAlg(signItem.expectedDigestAlg()) ? " \\(weak\\)" : "")
diff --git a/test/jdk/sun/security/tools/jarsigner/warnings/Test.java b/test/jdk/sun/security/tools/jarsigner/warnings/Test.java
index 0683c03c10c..224fa754eec 100644
--- a/test/jdk/sun/security/tools/jarsigner/warnings/Test.java
+++ b/test/jdk/sun/security/tools/jarsigner/warnings/Test.java
@@ -149,7 +149,7 @@ public abstract class Test {
             + "This algorithm will be disabled in a future update.";
 
     static final String WEAK_KEY_WARNING
-            = "It will be disabled in a future update.";
+            = "will be disabled in a future update.";
 
     static final String JAR_SIGNED = "jar signed.";