8309396: com/sun/jdi/JdbMethodExitTest.java fails with virtual thread…

…s due to a bug in determining the main thread id Reviewed-by: amenkov, sspitsyn
openjdk · Jun 6, 2023 · 65bdbc7 · 65bdbc7 · openjdk-notifier · Jun 6, 2023
1 parent 4a75fd4
commit 65bdbc7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/test/jdk/ProblemList-Virtual.txt b/test/jdk/ProblemList-Virtual.txt
@@ -28,7 +28,6 @@ com/sun/jdi/EATests.java#id0                                    8264699 generic-
 #
 
 com/sun/jdi/ExceptionEvents.java 8278470 generic-all
-com/sun/jdi/JdbMethodExitTest.java 8285422 generic-all
 com/sun/jdi/RedefineCrossStart.java 8278470 generic-all
 com/sun/jdi/RedefineNestmateAttr/TestNestmateAttr.java 8285422 generic-all
 com/sun/jdi/ReferrersTest.java 8285422 generic-all

diff --git a/test/jdk/com/sun/jdi/JdbMethodExitTest.java b/test/jdk/com/sun/jdi/JdbMethodExitTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2004, 2023, 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
@@ -153,7 +153,6 @@ public static void main(String[] args) {
         // a resume.
 
         JdbMethodExitTestTarg xx = new JdbMethodExitTestTarg();
-        System.out.println("threadid="+Thread.currentThread().getId());
         bkpt();
 
         // test all possible return types
@@ -202,9 +201,14 @@ protected void runCases() {
         // test all possible return types
         execCommand(JdbCommand.run())
                 .shouldContain("Breakpoint hit");
-        Integer threadId = Integer.parseInt(
-                new OutputAnalyzer(getDebuggeeOutput())
-                        .firstMatch("^threadid=(.*)$", 1));
+
+        // In order to find the main threadId, we need to parse a line from the "threads"
+        // command output that looks something like:
+        //    (java.lang.VirtualThread)694            main            running (at breakpoint)
+        OutputAnalyzer o = execCommand(JdbCommand.threads());
+        String match = o.firstMatch("^\\s*\\(.+\\)(\\d+)\\s+main\\s+running.+$", 1);
+        Integer threadId = Integer.parseInt(match);
+
         jdb.command(JdbCommand.untrace());
 
         jdb.command(JdbCommand.traceMethods(false, null));