Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

6622468: TEST_BUG: Time to retire the @debuggeeVMOptions mechanism used in the com.sun.jdi infrastructure #492

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jdk/test/com/sun/jdi/AccessSpecifierTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g AccessSpecifierTest.java
* @run main AccessSpecifierTest
* @run driver AccessSpecifierTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;
Expand Down
2 changes: 1 addition & 1 deletion jdk/test/com/sun/jdi/AfterThreadDeathTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g AfterThreadDeathTest.java
* @run main AfterThreadDeathTest
* @run driver AfterThreadDeathTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;
Expand Down
2 changes: 1 addition & 1 deletion jdk/test/com/sun/jdi/AllLineLocations.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
* @run compile -g RefTypes.java
* @run build AllLineLocations
*
* @run main AllLineLocations RefTypes
* @run driver AllLineLocations RefTypes
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;
Expand Down
2 changes: 1 addition & 1 deletion jdk/test/com/sun/jdi/AnyDebuggeeTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g AnyDebuggeeTest.java
* @run main AnyDebuggeeeTest
* @run driver AnyDebuggeeeTest
*
* This test is intended to be run manually to investigate behaviors;
* it is not an actual test of any specific functionality, it just
Expand Down
2 changes: 1 addition & 1 deletion jdk/test/com/sun/jdi/ArgumentValuesTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile ArgumentValuesTest.java
* @run main ArgumentValuesTest
* @run driver ArgumentValuesTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;
Expand Down
2 changes: 1 addition & 1 deletion jdk/test/com/sun/jdi/ArrayRangeTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g ArrayRangeTest.java
* @run main ArrayRangeTest
* @run driver ArrayRangeTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;
Expand Down
2 changes: 1 addition & 1 deletion jdk/test/com/sun/jdi/BacktraceFieldTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g BacktraceFieldTest.java
* @run main BacktraceFieldTest
* @run driver BacktraceFieldTest
*/

/*
Expand Down
2 changes: 1 addition & 1 deletion jdk/test/com/sun/jdi/BadHandshakeTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
* @library /lib/testlibrary
*
* @build jdk.testlibrary.* VMConnection BadHandshakeTest Exit0
* @run main BadHandshakeTest
* @run driver BadHandshakeTest
*
*/
import java.net.Socket;
Expand Down
2 changes: 1 addition & 1 deletion jdk/test/com/sun/jdi/BreakpointTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g BreakpointTest.java
* @run main BreakpointTest
* @run driver BreakpointTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;
Expand Down
2 changes: 1 addition & 1 deletion jdk/test/com/sun/jdi/ClassLoaderClassesTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g ClassLoaderClassesTest.java
* @run main ClassLoaderClassesTest
* @run driver ClassLoaderClassesTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;
Expand Down
2 changes: 1 addition & 1 deletion jdk/test/com/sun/jdi/ClassesByName.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
* @summary ClassesByName verifies that all the classes in the
* loaded class list can be found with classesByName..
*
* @run main ClassesByName HelloWorld
* @run driver ClassesByName HelloWorld
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;
Expand Down
2 changes: 1 addition & 1 deletion jdk/test/com/sun/jdi/ClassesByName2Test.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g ClassesByName2Test.java
* @run main ClassesByName2Test
* @run driver ClassesByName2Test
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;
Expand Down
8 changes: 4 additions & 4 deletions jdk/test/com/sun/jdi/ConnectedVMs.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g InstTarg.java
* @run main ConnectedVMs Kill
* @run main ConnectedVMs Resume-to-exit
* @run main ConnectedVMs dispose()
* @run main ConnectedVMs exit()
* @run driver ConnectedVMs Kill
* @run driver ConnectedVMs Resume-to-exit
* @run driver ConnectedVMs dispose()
* @run driver ConnectedVMs exit()
*
* @summary ConnectedVMs checks the method
* VirtualMachineManager.connectedVirtualMachines()
Expand Down
2 changes: 1 addition & 1 deletion jdk/test/com/sun/jdi/ConstantPoolInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*
* @run build TestScaffold VMConnection
* @run compile -g ConstantPoolInfo.java
* @run main ConstantPoolInfo
* @run driver ConstantPoolInfo
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;
Expand Down
2 changes: 1 addition & 1 deletion jdk/test/com/sun/jdi/CountEvent.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
*
* @run build TestScaffold VMConnection TargetAdapter TargetListener
* @run compile -g CountEvent.java
* @run main CountEvent
* @run driver CountEvent
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;
Expand Down
2 changes: 1 addition & 1 deletion jdk/test/com/sun/jdi/CountFilterTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g CountFilterTest.java
* @run main CountFilterTest
* @run driver CountFilterTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;
Expand Down
2 changes: 1 addition & 1 deletion jdk/test/com/sun/jdi/DataModelTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g DataModelTest.java
* @run main DataModelTest
* @run driver DataModelTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;
Expand Down
2 changes: 1 addition & 1 deletion jdk/test/com/sun/jdi/DebuggerThreadTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g DebuggerThreadTest.java
* @run main DebuggerThreadTest
* @run driver DebuggerThreadTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;
Expand Down
2 changes: 1 addition & 1 deletion jdk/test/com/sun/jdi/DeleteAllBkptsTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
* @library ..
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g DeleteAllBkptsTest.java
* @run main DeleteAllBkptsTest
* @run driver DeleteAllBkptsTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;
Expand Down
2 changes: 1 addition & 1 deletion jdk/test/com/sun/jdi/DeleteEventRequestsTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g DeleteEventRequestsTest.java
* @run main DeleteEventRequestsTest
* @run driver DeleteEventRequestsTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;
Expand Down
2 changes: 1 addition & 1 deletion jdk/test/com/sun/jdi/EarlyReturnNegativeTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g EarlyReturnNegativeTest.java
* @run main EarlyReturnNegativeTest
* @run driver EarlyReturnNegativeTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;
Expand Down
2 changes: 1 addition & 1 deletion jdk/test/com/sun/jdi/EarlyReturnTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g EarlyReturnTest.java
* @run main EarlyReturnTest
* @run driver EarlyReturnTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;
Expand Down
2 changes: 1 addition & 1 deletion jdk/test/com/sun/jdi/EnumTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g EnumTest.java
* @run main EnumTest
* @run driver EnumTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;
Expand Down
4 changes: 2 additions & 2 deletions jdk/test/com/sun/jdi/EventQueueDisconnectTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
*
* @run build VMConnection
* @run compile -g EventQueueDisconnectTest.java
* @run main EventQueueDisconnectTest
* @run driver EventQueueDisconnectTest
*
* @summary EventQueueDisconnectTest checks to see that
* VMDisconnectedException is never thrown before VMDisconnectEvent.
Expand Down Expand Up @@ -64,7 +64,7 @@ public static void main(String args[]) throws Exception {
"com.sun.jdi.CommandLineLaunch:",
VirtualMachine.TRACE_NONE);
connection.setConnectorArg("main", "EventQueueDisconnectTarg");
String debuggeeVMOptions = connection.getDebuggeeVMOptions();
String debuggeeVMOptions = VMConnection.getDebuggeeVMOptions();
if (!debuggeeVMOptions.equals("")) {
if (connection.connectorArg("options").length() > 0) {
throw new IllegalArgumentException("VM options in two places");
Expand Down
52 changes: 26 additions & 26 deletions jdk/test/com/sun/jdi/ExceptionEvents.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,32 +31,32 @@
* @run build TestScaffold VMConnection
* @run compile -g ExceptionEvents.java
*
* @run main/othervm ExceptionEvents N A StackOverflowCaughtTarg java.lang.Exception
* @run main/othervm ExceptionEvents C A StackOverflowCaughtTarg null
* @run main/othervm ExceptionEvents C A StackOverflowCaughtTarg java.lang.Error
* @run main/othervm ExceptionEvents C A StackOverflowCaughtTarg java.lang.StackOverflowError
* @run main/othervm ExceptionEvents N A StackOverflowCaughtTarg java.lang.NullPointerException

* @run main/othervm ExceptionEvents N T StackOverflowCaughtTarg java.lang.Exception
* @run main/othervm ExceptionEvents C T StackOverflowCaughtTarg null
* @run main/othervm ExceptionEvents C T StackOverflowCaughtTarg java.lang.Error
* @run main/othervm ExceptionEvents C T StackOverflowCaughtTarg java.lang.StackOverflowError
* @run main/othervm ExceptionEvents N T StackOverflowCaughtTarg java.lang.NullPointerException

* @run main/othervm ExceptionEvents N N StackOverflowCaughtTarg java.lang.Exception
* @run main/othervm ExceptionEvents C N StackOverflowCaughtTarg null
* @run main/othervm ExceptionEvents C N StackOverflowCaughtTarg java.lang.Error
* @run main/othervm ExceptionEvents C N StackOverflowCaughtTarg java.lang.StackOverflowError
* @run main/othervm ExceptionEvents N N StackOverflowCaughtTarg java.lang.NullPointerException

* @run main/othervm ExceptionEvents N A StackOverflowUncaughtTarg java.lang.Exception
* @run main/othervm ExceptionEvents U A StackOverflowUncaughtTarg null
* @run main/othervm ExceptionEvents U A StackOverflowUncaughtTarg java.lang.Error
* @run main/othervm ExceptionEvents U A StackOverflowUncaughtTarg java.lang.StackOverflowError
* @run main/othervm ExceptionEvents N A StackOverflowUncaughtTarg java.lang.NullPointerException

* @run main/othervm ExceptionEvents N T StackOverflowUncaughtTarg java.lang.NullPointerException
* @run main/othervm ExceptionEvents N N StackOverflowUncaughtTarg java.lang.NullPointerException
* @run driver ExceptionEvents N A StackOverflowCaughtTarg java.lang.Exception
* @run driver ExceptionEvents C A StackOverflowCaughtTarg null
* @run driver ExceptionEvents C A StackOverflowCaughtTarg java.lang.Error
* @run driver ExceptionEvents C A StackOverflowCaughtTarg java.lang.StackOverflowError
* @run driver ExceptionEvents N A StackOverflowCaughtTarg java.lang.NullPointerException

* @run driver ExceptionEvents N T StackOverflowCaughtTarg java.lang.Exception
* @run driver ExceptionEvents C T StackOverflowCaughtTarg null
* @run driver ExceptionEvents C T StackOverflowCaughtTarg java.lang.Error
* @run driver ExceptionEvents C T StackOverflowCaughtTarg java.lang.StackOverflowError
* @run driver ExceptionEvents N T StackOverflowCaughtTarg java.lang.NullPointerException

* @run driver ExceptionEvents N N StackOverflowCaughtTarg java.lang.Exception
* @run driver ExceptionEvents C N StackOverflowCaughtTarg null
* @run driver ExceptionEvents C N StackOverflowCaughtTarg java.lang.Error
* @run driver ExceptionEvents C N StackOverflowCaughtTarg java.lang.StackOverflowError
* @run driver ExceptionEvents N N StackOverflowCaughtTarg java.lang.NullPointerException

* @run driver ExceptionEvents N A StackOverflowUncaughtTarg java.lang.Exception
* @run driver ExceptionEvents U A StackOverflowUncaughtTarg null
* @run driver ExceptionEvents U A StackOverflowUncaughtTarg java.lang.Error
* @run driver ExceptionEvents U A StackOverflowUncaughtTarg java.lang.StackOverflowError
* @run driver ExceptionEvents N A StackOverflowUncaughtTarg java.lang.NullPointerException

* @run driver ExceptionEvents N T StackOverflowUncaughtTarg java.lang.NullPointerException
* @run driver ExceptionEvents N N StackOverflowUncaughtTarg java.lang.NullPointerException

*/
import com.sun.jdi.*;
Expand Down
2 changes: 1 addition & 1 deletion jdk/test/com/sun/jdi/ExclusiveBind.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* @library /lib/testlibrary
*
* @build jdk.testlibrary.* VMConnection ExclusiveBind HelloWorld
* @run main ExclusiveBind
* @run driver ExclusiveBind
*/
import java.net.ServerSocket;
import com.sun.jdi.Bootstrap;
Expand Down
2 changes: 1 addition & 1 deletion jdk/test/com/sun/jdi/ExpiredRequestDeletionTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g ExpiredRequestDeletionTest.java
* @run main ExpiredRequestDeletionTest
* @run driver ExpiredRequestDeletionTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;
Expand Down
2 changes: 1 addition & 1 deletion jdk/test/com/sun/jdi/FetchLocals.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g FetchLocals.java
* @run main FetchLocals
* @run driver FetchLocals
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;
Expand Down
2 changes: 1 addition & 1 deletion jdk/test/com/sun/jdi/FieldWatchpoints.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g FieldWatchpoints.java
* @run main/othervm FieldWatchpoints
* @run driver FieldWatchpoints
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;
Expand Down
2 changes: 1 addition & 1 deletion jdk/test/com/sun/jdi/FilterMatch.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*
* @run build JDIScaffold VMConnection
* @run compile -g HelloWorld.java
* @run main/othervm FilterMatch
* @run driver FilterMatch
*/

/* Look at patternMatch in JDK file:
Expand Down
2 changes: 1 addition & 1 deletion jdk/test/com/sun/jdi/FilterNoMatch.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*
* @run build JDIScaffold VMConnection
* @run compile -g HelloWorld.java
* @run main/othervm FilterNoMatch
* @run driver FilterNoMatch
*/

/* This tests the patternMatch function in JDK file:
Expand Down
2 changes: 1 addition & 1 deletion jdk/test/com/sun/jdi/FinalLocalsTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g FinalLocalsTest.java
* @run main FinalLocalsTest
* @run driver FinalLocalsTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;
Expand Down
2 changes: 1 addition & 1 deletion jdk/test/com/sun/jdi/FinalizerTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g FinalizerTest.java
*
* @run main FinalizerTest
* @run driver FinalizerTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;
Expand Down
2 changes: 1 addition & 1 deletion jdk/test/com/sun/jdi/FramesTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g FramesTest.java
* @run main FramesTest
* @run driver FramesTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;
Expand Down
2 changes: 1 addition & 1 deletion jdk/test/com/sun/jdi/GenericsTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g GenericsTest.java
* @run main GenericsTest
* @run driver GenericsTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;
Expand Down
2 changes: 1 addition & 1 deletion jdk/test/com/sun/jdi/GetLocalVariables.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g GetLocalVariables.java
* @run main GetLocalVariables
* @run driver GetLocalVariables
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;
Expand Down
2 changes: 1 addition & 1 deletion jdk/test/com/sun/jdi/GetLocalVariables2Test.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g GetLocalVariables2Test.java
* @run main GetLocalVariables2Test
* @run driver GetLocalVariables2Test
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;
Expand Down
Loading