From 8a466007772a795fd8338998c4ed55c3367bc8ea Mon Sep 17 00:00:00 2001
From: Ivan Bereziuk <ivan.bereziuk@oracle.com>
Date: Fri, 19 Sep 2025 11:16:27 +0200
Subject: [PATCH] CodeCacheTest.java and ClassHierarchyTest.java to account for
 added timestamp

---
 .../serviceability/dcmd/compiler/CodeCacheTest.java    |  1 +
 .../serviceability/dcmd/vm/ClassHierarchyTest.java     | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/test/hotspot/jtreg/serviceability/dcmd/compiler/CodeCacheTest.java b/test/hotspot/jtreg/serviceability/dcmd/compiler/CodeCacheTest.java
index 157c1713ec2..70d215640f8 100644
--- a/test/hotspot/jtreg/serviceability/dcmd/compiler/CodeCacheTest.java
+++ b/test/hotspot/jtreg/serviceability/dcmd/compiler/CodeCacheTest.java
@@ -113,6 +113,7 @@ public class CodeCacheTest {
         // Get output from dcmd (diagnostic command)
         OutputAnalyzer output = executor.execute("Compiler.codecache");
         Iterator<String> lines = output.asLines().iterator();
+        lines.next(); // skip timestamp
 
         // Validate code cache segments
         String line;
diff --git a/test/hotspot/jtreg/serviceability/dcmd/vm/ClassHierarchyTest.java b/test/hotspot/jtreg/serviceability/dcmd/vm/ClassHierarchyTest.java
index 4dcdeb003bf..2caec1478aa 100644
--- a/test/hotspot/jtreg/serviceability/dcmd/vm/ClassHierarchyTest.java
+++ b/test/hotspot/jtreg/serviceability/dcmd/vm/ClassHierarchyTest.java
@@ -54,15 +54,18 @@ public class ClassHierarchyTest {
     // |--DcmdTestClass$$Lambda/4081552/0xa529fbb0
 
     // > VM.class_hierarchy DcmdBaseClass
+    // 2025-01-01 10:59:59
     // java.lang.Object/null
     // |--DcmdBaseClass/0xa4abcd48
 
     // > VM.class_hierarchy DcmdBaseClass -s
+    // 2025-01-01 10:59:59
     // java.lang.Object/null
     // |--DcmdBaseClass/0xa4abcd48
     // |  |--DcmdTestClass/0xa4abcd48
 
     // > VM.class_hierarchy DcmdBaseClass -i -s
+    // 2025-01-01 10:59:59
     // java.lang.Object/null
     // |--DcmdBaseClass/0xa4abcd48
     // |  implements Intf2/0xa4abcd48 (declared intf)
@@ -111,13 +114,14 @@ public class ClassHierarchyTest {
         // Verify the output for the simple hierachry of just DcmdBaseClass.
         output = executor.execute("VM.class_hierarchy DcmdBaseClass");
         lines = output.asLines().iterator();
+        lines.next(); // skip timestamp
         i = 0;
         while (lines.hasNext()) {
             String line = lines.next();
             Matcher m = expected_lines[i].matcher(line);
             i++;
             if (!m.matches()) {
-                Assert.fail("Failed to match line #" + i + ": " + line);
+                Assert.fail("Failed. Expected line #%d \"%s\" to match \"%s\"".formatted(i, line, expected_lines[i].pattern()));
             }
             // Should only be two lines of output in this form.
             if (i == 2) break;
@@ -130,13 +134,14 @@ public class ClassHierarchyTest {
         // Verify the output for the full hierarchy of DcmdBaseClass, but without interfaces.
         output = executor.execute("VM.class_hierarchy DcmdBaseClass -s");
         lines = output.asLines().iterator();
+        lines.next(); // skip timestamp
         i = 0;
         while (lines.hasNext()) {
             String line = lines.next();
             Matcher m = expected_lines[i].matcher(line);
             i++;
             if (!m.matches()) {
-                Assert.fail("Failed to match line #" + i + ": " + line);
+                Assert.fail("Failed. Expected line #%d \"%s\" to match \"%s\"".formatted(i, line, expected_lines[i].pattern()));
             }
             // "implements" lines should not be in this output.
             if (i == 2 || i == 4) i += 2;
@@ -149,6 +154,7 @@ public class ClassHierarchyTest {
         // Verify the output for the full hierarchy of DcmdBaseClass, including interfaces.
         output = executor.execute("VM.class_hierarchy DcmdBaseClass -i -s");
         lines = output.asLines().iterator();
+        lines.next(); // skip timestamp
         i = 0;
         String classLoaderAddr = null;
         while (lines.hasNext()) {