8353953: com/sun/jdi tests should be fixed to not always require includevirtualthreads=y

Backport-of: d1d81dd01ca6f3fc1e4710e6055c5a3185f43d9a

Author: rgithubli

test/jdk/com/sun/jdi/EventQueueDisconnectTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, 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
@@ -62,7 +62,7 @@ public class EventQueueDisconnectTest {
     public static void main(String args[]) throws Exception {
         VMConnection connection = new VMConnection(
                                        "com.sun.jdi.CommandLineLaunch:",
-                                       VirtualMachine.TRACE_NONE);
+                                       VirtualMachine.TRACE_NONE, false);
         connection.setConnectorArg("main", "EventQueueDisconnectTarg");
         String debuggeeVMOptions = VMConnection.getDebuggeeVMOptions();
         if (!debuggeeVMOptions.equals("")) {

test/jdk/com/sun/jdi/RedefineNestmateAttr/TestNestmateAttr.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 2025, 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
@@ -213,6 +213,7 @@ public class TestNestmateAttr extends TestScaffold {
 
     TestNestmateAttr (String[] args) {
         super(args);
+        enableIncludeVirtualthreads(); // need to run debug agent with includevirtualthreads=y
     }
 
     public static void main(String[] args) throws Throwable {

test/jdk/com/sun/jdi/TestScaffold.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, 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
@@ -42,6 +42,9 @@ abstract public class TestScaffold extends TargetAdapter {
     private boolean redefineAsynchronously = false;
     private ReferenceType mainStartClass = null;
 
+    // Set true by tests that need the debug agent to be run with includevirtualthreads=y.
+    private boolean includeVThreads = false;
+
     ThreadReference mainThread;
     /**
      * We create a VMDeathRequest, SUSPEND_ALL, to sync the BE and FE.
@@ -84,6 +87,10 @@ public void mySleep(int millis) {
         }
     }
 
+    void enableIncludeVirtualthreads() {
+        includeVThreads = true;
+    }
+
     boolean getExceptionCaught() {
         return exceptionCaught;
     }
@@ -588,7 +595,8 @@ public void connect(String args[]) {
 
         argInfo.targetVMArgs = VMConnection.getDebuggeeVMOptions() + " " + argInfo.targetVMArgs;
         connection = new VMConnection(argInfo.connectorSpec,
-                                      argInfo.traceFlags);
+                                      argInfo.traceFlags,
+                                      includeVThreads);
 
         addListener(new TargetAdapter() {
                 public void eventSetComplete(EventSet set) {

test/jdk/com/sun/jdi/VMConnection.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, 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
@@ -123,9 +123,9 @@ private Map parseConnectorArgs(Connector connector, String argString) {
         return arguments;
     }
 
-    VMConnection(String connectSpec, int traceFlags) {
+    VMConnection(String connectSpec, int traceFlags, boolean includeVThreads) {
         String nameString;
-        String argString = "includevirtualthreads=y";
+        String argString = "includevirtualthreads=" + (includeVThreads ? 'y' : 'n');
         int index = connectSpec.indexOf(':');
         if (index == -1) {
             nameString = connectSpec;