8283010: serviceability/sa/ClhsdbThread.java failed with "'Base of Stack:' missing from stdout/stderr "

Reviewed-by: amenkov

Author: plummercj

test/hotspot/jtreg/serviceability/sa/ClhsdbThread.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,7 @@
 import java.util.List;
 import java.util.Map;
 import jdk.test.lib.apps.LingeredApp;
+import jdk.test.lib.Platform;
 import jtreg.SkippedException;
 
 /**
@@ -96,10 +97,17 @@ public static void main(String[] args) throws Exception {
             System.out.println("Thread Id obtained is: " + threadIdObtained);
 
             String cmd = "thread " + threadIdObtained;
-            expStrMap.put(cmd, List.of(
-                "Base of Stack:",
-                "State:",
-                "Last_Java_SP"));
+            if (Platform.isWindows()) {
+                // On windows thread IDs are not guaranteed to be the same each time you attach,
+                // so the ID we gleaned above for the Finalizer thread may not actually be for
+                // the Finalizer thread when we attach for the following "thread" command, so we
+                // choose not to check the result on Windows.
+            } else {
+                expStrMap.put(cmd, List.of(
+                    "Base of Stack:",
+                    "State:",
+                    "Last_Java_SP"));
+            }
             cmds = List.of(cmd);
             test.run(theApp.getPid(), cmds, expStrMap, null);
         } catch (SkippedException se) {