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

Use jtreg "@run driver" for the JDI tests

Reviewed-by: sspitsyn, dholmes
This commit is contained in:
Staffan Larsen 2014-06-17 10:01:16 +02:00
parent 7e1185e152
commit 9158c1d9b6
104 changed files with 192 additions and 232 deletions

View File

@ -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.*;

View File

@ -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.*;

View File

@ -32,7 +32,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.*;

View File

@ -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

View File

@ -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.*;

View File

@ -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.*;

View File

@ -30,7 +30,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g BacktraceFieldTest.java
* @run main BacktraceFieldTest
* @run driver BacktraceFieldTest
*/
/*

View File

@ -27,7 +27,7 @@
* @library /lib/testlibrary
*
* @build jdk.testlibrary.* VMConnection BadHandshakeTest Exit0
* @run main BadHandshakeTest
* @run driver BadHandshakeTest
*
*/
import java.net.Socket;

View File

@ -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.*;

View File

@ -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.*;

View File

@ -34,7 +34,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.*;

View File

@ -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.*;

View File

@ -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()

View File

@ -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.*;

View File

@ -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.*;

View File

@ -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.*;

View File

@ -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.*;

View File

@ -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.*;

View File

@ -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.*;

View File

@ -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.*;

View File

@ -26,14 +26,13 @@
* @summary Check that a double agent request fails
*
* @build VMConnection DoubleAgentTest Exit0
* @run main DoubleAgentTest
* @run driver DoubleAgentTest
*
*/
import java.io.InputStream;
import java.io.IOException;
import java.io.File;
import java.net.ServerSocket;
import java.net.Socket;
public class DoubleAgentTest {

View File

@ -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.*;

View File

@ -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.*;

View File

@ -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.*;

View File

@ -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.
@ -64,7 +64,7 @@ public class EventQueueDisconnectTest {
"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");

View File

@ -32,32 +32,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 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 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 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 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 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 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 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 main/othervm ExceptionEvents N T StackOverflowUncaughtTarg java.lang.NullPointerException
* @run main/othervm ExceptionEvents N N 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.*;

View File

@ -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;

View File

@ -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.*;

View File

@ -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.*;

View File

@ -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.*;

View File

@ -31,7 +31,7 @@
* @library scaffold
* @run build JDIScaffold VMConnection
* @run compile -g HelloWorld.java
* @run main/othervm FilterMatch
* @run driver FilterMatch
*/
/* Look at patternMatch in JDK file:

View File

@ -31,7 +31,7 @@
* @library scaffold
* @run build JDIScaffold VMConnection
* @run compile -g HelloWorld.java
* @run main/othervm FilterNoMatch
* @run driver FilterNoMatch
*/
/* This tests the patternMatch function in JDK file:

View File

@ -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.*;

View File

@ -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.*;

View File

@ -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.*;

View File

@ -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.*;

View File

@ -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.*;

View File

@ -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.*;

View File

@ -7,7 +7,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g GetSetLocalTest.java
* @run main GetSetLocalTest
* @run driver GetSetLocalTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;

View File

@ -30,7 +30,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g GetUninitializedStringValue.java
* @run main GetUninitializedStringValue
* @run driver GetUninitializedStringValue
*/
import com.sun.jdi.ReferenceType;
import com.sun.jdi.StackFrame;

View File

@ -30,7 +30,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g HomeTest.java
* @run main HomeTest
* @run driver HomeTest
*/
import com.sun.jdi.*;
import com.sun.jdi.connect.*;

View File

@ -31,7 +31,7 @@
*
* @run build TestScaffold VMConnection TargetAdapter TargetListener
* @run compile -g InstanceFilter.java
* @run main/othervm InstanceFilter
* @run driver InstanceFilter
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;

View File

@ -29,7 +29,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g InstancesTest.java
* @run main InstancesTest
* @run driver InstancesTest
*/
/*

View File

@ -28,7 +28,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run build InterfaceMethodsTest
* @run main InterfaceMethodsTest
* @run driver InterfaceMethodsTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;

View File

@ -7,7 +7,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g InterruptHangTest.java
* @run main InterruptHangTest
* @run driver InterruptHangTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;

View File

@ -30,7 +30,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g InvokeHangTest.java
* @run main InvokeHangTest
* @run driver InvokeHangTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;

View File

@ -31,7 +31,7 @@
* @library ..
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g InvokeTest.java
* @run main InvokeTest
* @run driver InvokeTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;

View File

@ -46,7 +46,7 @@
* assure that launching on uncaught exception works
*
* @author Robert Field
* @run main/othervm JITDebug
* @run driver JITDebug
*/
import com.sun.jdi.*;

View File

@ -30,7 +30,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g Java_gTest.java
* @run main Java_gTest
* @run driver Java_gTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;

View File

@ -31,7 +31,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g LambdaBreakpointTest.java
* @run main LambdaBreakpointTest
* @run driver LambdaBreakpointTest
*/
import java.util.List;

View File

@ -29,7 +29,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g LambdaStepTest.java
* @run main LambdaStepTest
* @run driver LambdaStepTest
*/
import com.sun.jdi.LocalVariable;
import com.sun.jdi.ObjectReference;

View File

@ -32,7 +32,7 @@
* @run compile -g HelloWorld.java
* @run build LaunchCommandLine
*
* @run main LaunchCommandLine
* @run driver LaunchCommandLine
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;

View File

@ -30,7 +30,7 @@
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g LineNumberInfo.java ControlFlow.java
*
* @run main LineNumberInfo
* @run driver LineNumberInfo
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;

View File

@ -7,7 +7,7 @@
*
* @run build VMConnection TargetListener TargetAdapter
* @run compile -g LineNumberOnBraceTest.java
* @run main LineNumberOnBraceTest
* @run driver LineNumberOnBraceTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;

View File

@ -30,7 +30,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g LocalVariableEqual.java
* @run main LocalVariableEqual
* @run driver LocalVariableEqual
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;

View File

@ -30,7 +30,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g LocationTest.java
* @run main LocationTest
* @run driver LocationTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;

View File

@ -29,9 +29,9 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g MethodEntryExitEvents.java
* @run main MethodEntryExitEvents SUSPEND_EVENT_THREAD MethodEntryExitEventsDebugee
* @run main MethodEntryExitEvents SUSPEND_NONE MethodEntryExitEventsDebugee
* @run main MethodEntryExitEvents SUSPEND_ALL MethodEntryExitEventsDebugee
* @run driver MethodEntryExitEvents SUSPEND_EVENT_THREAD MethodEntryExitEventsDebugee
* @run driver MethodEntryExitEvents SUSPEND_NONE MethodEntryExitEventsDebugee
* @run driver MethodEntryExitEvents SUSPEND_ALL MethodEntryExitEventsDebugee
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;

View File

@ -29,7 +29,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g MethodExitReturnValuesTest.java
* @run main MethodExitReturnValuesTest
* @run driver MethodExitReturnValuesTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;

View File

@ -32,7 +32,7 @@
* @library scaffold
* @run build JDIScaffold VMConnection
* @run compile -g ModificationWatchpoints.java
* @run main/othervm ModificationWatchpoints
* @run driver ModificationWatchpoints
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;

View File

@ -30,7 +30,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g MonitorEventTest.java
* @run main MonitorEventTest
* @run driver MonitorEventTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;

View File

@ -31,7 +31,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g MonitorFrameInfo.java
* @run main MonitorFrameInfo
* @run driver MonitorFrameInfo
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;

View File

@ -31,7 +31,7 @@
*
* @build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g MultiBreakpointsTest.java
* @run main MultiBreakpointsTest
* @run driver MultiBreakpointsTest
*/
/*

View File

@ -31,7 +31,7 @@
* @library scaffold
* @run build JDIScaffold VMConnection
* @compile -XDignore.symbol.file NativeInstanceFilterTarg.java
* @run main/othervm NativeInstanceFilter
* @run driver NativeInstanceFilter
*/
/*

View File

@ -31,7 +31,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g NewInstanceTest.java
* @run main NewInstanceTest
* @run driver NewInstanceTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;

View File

@ -29,7 +29,7 @@
*
* @run compile -g NoLaunchOptionTest.java
* @build VMConnection
* @run main/othervm NoLaunchOptionTest
* @run driver NoLaunchOptionTest
*/
import java.net.ServerSocket;

View File

@ -31,7 +31,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g:none NoLocInfoTest.java
* @run main NoLocInfoTest
* @run driver NoLocInfoTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;

View File

@ -27,7 +27,7 @@
* @summary Ensure that JDWP doesn't crash with a null thread group name
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run main NullThreadGroupNameTest
* @run driver NullThreadGroupNameTest
*/
import com.sun.jdi.*;
import com.sun.jdi.connect.*;

View File

@ -30,7 +30,7 @@
* @run compile -g OnThrowTest.java
* @run compile -g OnThrowTarget.java
* @run compile -g VMConnection.java
* @run main/othervm OnThrowTest
* @run driver OnThrowTest
*/
import java.io.File;

View File

@ -30,7 +30,7 @@
* @run compile -g OptionTest.java
* @run compile -g HelloWorld.java
* @run compile -g VMConnection.java
* @run main/othervm OptionTest
* @run driver OptionTest
*/
import java.net.ServerSocket;

View File

@ -31,7 +31,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g PopAndInvokeTest.java
* @run main PopAndInvokeTest
* @run driver PopAndInvokeTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;

View File

@ -10,7 +10,7 @@
* @library ..
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g PopAndStepTest.java
* @run main PopAndStepTest
* @run driver PopAndStepTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;

View File

@ -31,7 +31,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g PopAsynchronousTest.java
* @run main PopAsynchronousTest
* @run driver PopAsynchronousTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;

View File

@ -31,7 +31,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g PopSynchronousTest.java
* @run main PopSynchronousTest
* @run driver PopSynchronousTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;

View File

@ -46,26 +46,26 @@
* @run compile -g RepStepTarg.java
* @run compile -g RequestReflectionTest.java
*
* @run main AccessSpecifierTest -redefstart -redefevent
* @run main AfterThreadDeathTest -redefstart -redefevent
* @run main ArrayRangeTest -redefstart -redefevent
* @run main BacktraceFieldTest -redefstart -redefevent
* @run main ClassesByName2Test -redefstart -redefevent
* @run main DebuggerThreadTest -redefstart -redefevent
* @run main DeleteEventRequestsTest -redefstart -redefevent
* @run main/othervm ExceptionEvents -redefstart -redefevent N A StackOverflowCaughtTarg java.lang.Exception
* @run main/othervm ExceptionEvents -redefstart -redefevent C A StackOverflowCaughtTarg null
* @run main/othervm ExceptionEvents -redefstart -redefevent C A StackOverflowCaughtTarg java.lang.StackOverflowError
* @run main/othervm ExceptionEvents -redefstart -redefevent N A StackOverflowCaughtTarg java.lang.NullPointerException
* @run main/othervm ExceptionEvents -redefstart -redefevent C T StackOverflowCaughtTarg java.lang.Error
* @run main/othervm ExceptionEvents -redefstart -redefevent N T StackOverflowCaughtTarg java.lang.NullPointerException
* @run main/othervm ExceptionEvents -redefstart -redefevent N N StackOverflowCaughtTarg java.lang.Exception
* @run main/othervm ExceptionEvents -redefstart -redefevent C N StackOverflowCaughtTarg java.lang.Error
* @run main/othervm ExceptionEvents -redefstart -redefevent N A StackOverflowUncaughtTarg java.lang.Exception
* @run main ExpiredRequestDeletionTest -redefstart -redefevent
* @run main/othervm FieldWatchpoints -redefstart -redefevent
* @run main/othervm InstanceFilter -redefstart -redefevent
* @run main LocationTest -redefstart -redefevent
* @run main NewInstanceTest -redefstart -redefevent
* @run main RequestReflectionTest -redefstart -redefevent
* @run driver AccessSpecifierTest -redefstart -redefevent
* @run driver AfterThreadDeathTest -redefstart -redefevent
* @run driver ArrayRangeTest -redefstart -redefevent
* @run driver BacktraceFieldTest -redefstart -redefevent
* @run driver ClassesByName2Test -redefstart -redefevent
* @run driver DebuggerThreadTest -redefstart -redefevent
* @run driver DeleteEventRequestsTest -redefstart -redefevent
* @run driver ExceptionEvents -redefstart -redefevent N A StackOverflowCaughtTarg java.lang.Exception
* @run driver ExceptionEvents -redefstart -redefevent C A StackOverflowCaughtTarg null
* @run driver ExceptionEvents -redefstart -redefevent C A StackOverflowCaughtTarg java.lang.StackOverflowError
* @run driver ExceptionEvents -redefstart -redefevent N A StackOverflowCaughtTarg java.lang.NullPointerException
* @run driver ExceptionEvents -redefstart -redefevent C T StackOverflowCaughtTarg java.lang.Error
* @run driver ExceptionEvents -redefstart -redefevent N T StackOverflowCaughtTarg java.lang.NullPointerException
* @run driver ExceptionEvents -redefstart -redefevent N N StackOverflowCaughtTarg java.lang.Exception
* @run driver ExceptionEvents -redefstart -redefevent C N StackOverflowCaughtTarg java.lang.Error
* @run driver ExceptionEvents -redefstart -redefevent N A StackOverflowUncaughtTarg java.lang.Exception
* @run driver ExpiredRequestDeletionTest -redefstart -redefevent
* @run driver FieldWatchpoints -redefstart -redefevent
* @run driver InstanceFilter -redefstart -redefevent
* @run driver LocationTest -redefstart -redefevent
* @run driver NewInstanceTest -redefstart -redefevent
* @run driver RequestReflectionTest -redefstart -redefevent
*/

View File

@ -37,13 +37,13 @@
* @run compile -g FramesTest.java
* @run compile -g InvokeTest.java
*
* @run main CountEvent -redefstart
* @run main CountFilterTest -redefstart
* @run main FramesTest -redefstart
* @run main InvokeTest -redefstart
* @run driver CountEvent -redefstart
* @run driver CountFilterTest -redefstart
* @run driver FramesTest -redefstart
* @run driver InvokeTest -redefstart
*
* @run main/othervm ExceptionEvents -redefstart U A StackOverflowUncaughtTarg null
* @run main/othervm ExceptionEvents -redefstart U A StackOverflowUncaughtTarg java.lang.Error
* @run main/othervm ExceptionEvents -redefstart U A StackOverflowUncaughtTarg java.lang.StackOverflowError
* @run main PopSynchronousTest -redefstart
* @run driver ExceptionEvents -redefstart U A StackOverflowUncaughtTarg null
* @run driver ExceptionEvents -redefstart U A StackOverflowUncaughtTarg java.lang.Error
* @run driver ExceptionEvents -redefstart U A StackOverflowUncaughtTarg java.lang.StackOverflowError
* @run driver PopSynchronousTest -redefstart
*/

View File

@ -29,7 +29,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g ReferrersTest.java
* @run main ReferrersTest
* @run driver ReferrersTest
*/
/*

View File

@ -29,7 +29,7 @@
* @run compile -g RepStepTarg.java
* @run build VMConnection RepStep
*
* @run main/othervm RepStep
* @run driver RepStep
*
* @summary RepStep detects missed step events due to lack of
* frame pop events (in back-end).

View File

@ -28,7 +28,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g RequestReflectionTest.java
* @run main RequestReflectionTest
* @run driver RequestReflectionTest
*
* @summary RequestReflectionTest checks to see that reflective
* accessors on EventRequests return what they are given.

View File

@ -30,7 +30,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g ResumeOneThreadTest.java
* @run main ResumeOneThreadTest
* @run driver ResumeOneThreadTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;

View File

@ -26,7 +26,7 @@
* @summary Test that with server=y, when VM runs to System.exit() no error happens
*
* @build VMConnection RunToExit Exit0
* @run main/othervm RunToExit
* @run driver RunToExit
*/
import java.io.InputStream;
import java.io.IOException;

View File

@ -30,7 +30,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g SDENullTest.java
* @run main SDENullTest
* @run driver SDENullTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;

View File

@ -30,7 +30,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g SimulResumerTest.java
* @run main/othervm SimulResumerTest
* @run driver SimulResumerTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;

View File

@ -30,9 +30,9 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g SourceNameFilterTest.java
* @run main SourceNameFilterTest
* @run driver SourceNameFilterTest
* @run compile -g:none SourceNameFilterTest.java
* @run main SourceNameFilterTest
* @run driver SourceNameFilterTest
*/
// The compile -g:none suppresses the lineNumber table to trigger bug 6646613.

View File

@ -51,15 +51,15 @@
* | | | +--- Debuggee command Line
* V V V V Workaround-----+
* V
* @run main StepTest 2 line 2 MethodCalls
* @run main StepTest 3 line 14 MethodCalls
* @run driver StepTest 2 line 2 MethodCalls
* @run driver StepTest 3 line 14 MethodCalls
*
* @run main StepTest 2 line 18 MethodCallsReflection 12
* @run driver StepTest 2 line 18 MethodCallsReflection 12
*
* @run main StepTest 2 min 4 MethodCalls
* @run main StepTest 3 min 43 MethodCalls
* @run driver StepTest 2 min 4 MethodCalls
* @run driver StepTest 3 min 43 MethodCalls
*
* @run main StepTest 2 line 65 ControlFlow 64
* @run driver StepTest 2 line 65 ControlFlow 64
*/
/*

View File

@ -30,7 +30,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g SuspendThreadTest.java
* @run main SuspendThreadTest
* @run driver SuspendThreadTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;

View File

@ -33,7 +33,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g TemplateTest.java
* @run main TemplateTest
* @run driver TemplateTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;

View File

@ -30,7 +30,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile ThreadGroupTest.java
* @run main ThreadGroupTest
* @run driver ThreadGroupTest
*/
import com.sun.jdi.*;
import com.sun.jdi.connect.*;

View File

@ -30,7 +30,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g TwoThreadsTest.java
* @run main TwoThreadsTest
* @run driver TwoThreadsTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;

View File

@ -30,7 +30,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g UTF8Test.java
* @run main UTF8Test
* @run driver UTF8Test
*/
/*

View File

@ -33,7 +33,7 @@
* @run compile -g InnerTarg.java
* @run build UnpreparedByName
*
* @run main UnpreparedByName InnerTarg
* @run driver UnpreparedByName InnerTarg
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;

View File

@ -33,7 +33,7 @@
* @run compile -g InnerTarg.java
* @run build UnpreparedClasses
*
* @run main UnpreparedClasses InnerTarg
* @run driver UnpreparedClasses InnerTarg
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;

View File

@ -52,61 +52,23 @@ class VMConnection {
// When we run under jtreg, test.classes contains the pathname of
// the dir in which the .class files will be placed.
BufferedReader reader;
String testClasses = System.getProperty("test.classes");
if (testClasses == null) {
return retVal;
}
retVal += "-classpath " + testClasses + " ";
File myFile = new File(testClasses, "@debuggeeVMOptions");
retVal += "-classpath " + testClasses;
if (!myFile.canRead()) {
// Not there - look in parent (in case we are in a subdir)
myFile = new File(testClasses);
String parentDir = myFile.getParent();
if (parentDir != null) {
myFile = new File(parentDir, "@debuggeeVMOptions");
if (!myFile.canRead()) {
return retVal;
}
}
String vmOpts = System.getProperty("test.vm.opts");
System.out.println("vmOpts: "+vmOpts);
if (vmOpts != null) {
retVal += " " + vmOpts;
}
String wholePath = myFile.getPath();
try {
reader = new BufferedReader(new FileReader(myFile));
} catch (FileNotFoundException ee) {
System.out.println("-- Error 2 trying to access file " +
wholePath + ": " + ee);
return retVal;
String javaOpts = System.getProperty("test.java.opts");
System.out.println("javaOpts: "+javaOpts);
if (javaOpts != null) {
retVal += " " + javaOpts;
}
String line;
while (true) {
try {
line = reader.readLine();
} catch (IOException ee) {
System.out.println("-- Error reading options from file " +
wholePath + ": " + ee);
break;
}
if (line == null) {
System.out.println("-- No debuggee VM options found in file " +
wholePath);
break;
}
line = line.trim();
if (line.length() != 0 && !line.startsWith("#")) {
System.out.println("-- Added debuggeeVM options from file " +
wholePath + ": " + line);
retVal += line;
break;
}
// Else, read he next line.
}
try {
reader.close();
} catch (IOException ee) {
}
return retVal;
}

View File

@ -31,7 +31,7 @@
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g HelloWorld.java
* @run build VMDeathLastTest
* @run main VMDeathLastTest
* @run driver VMDeathLastTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;

View File

@ -29,7 +29,7 @@
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g HelloWorld.java
* @run build VMDeathRequestTest
* @run main VMDeathRequestTest
* @run driver VMDeathRequestTest
*
* @summary VMDeathRequestTest checks to see that
* VMDisconnectedException is never thrown before VMDisconnectEvent.

View File

@ -30,7 +30,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g VarargsTest.java
* @run main VarargsTest
* @run driver VarargsTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;

View File

@ -30,7 +30,7 @@
* @library scaffold
* @run build JDIScaffold VMConnection
* @run compile -g Vars.java
* @run main/othervm Vars
* @run driver Vars
*/
import com.sun.jdi.*;

View File

@ -30,7 +30,7 @@
*
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g VisibleMethods.java
* @run main VisibleMethods
* @run driver VisibleMethods
*/
import com.sun.jdi.Method;
import com.sun.jdi.ReferenceType;

View File

@ -34,7 +34,7 @@
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g RedefineTest.java
* @run shell RedefineSetUp.sh
* @run main/othervm RedefineTest
* @run driver RedefineTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;

View File

@ -32,8 +32,8 @@
* @run build TestScaffold VMConnection TargetListener TargetAdapter
* @run compile -g RedefineTest.java
* @run shell RedefineSetUp.sh
* @run main RedefineTest -repeat 3
* @run main RedefineTest
* @run driver RedefineTest -repeat 3
* @run driver RedefineTest
*/
import com.sun.jdi.*;
import com.sun.jdi.event.*;

View File

@ -9,21 +9,21 @@
* @run build TestScaffold VMConnection TargetListener TargetAdapter InstallSDE
* @run compile FilterMangleTest.java
* @run compile -g onion/pickle/Mangle.java
* @run main FilterMangleTest
* @run main FilterMangleTest SDE-pMangle.java*
* @run main FilterMangleTest SDE-pMangle.jav*
* @run main FilterMangleTest SDE-pMangle.j*
* @run main FilterMangleTest SDE-p*Mangle.java
* @run main FilterMangleTest SDE-p*angle.java
* @run main FilterMangleTest SDE-p*java
* @run main FilterMangleTest SDE-pMangle.xyz
* @run main FilterMangleTest SDE-pIncl.rats*
* @run main FilterMangleTest SDE-pIncl.rat*
* @run main FilterMangleTest SDE-p*angle.rats
* @run main FilterMangleTest SDE-f*Incl.rat
* @run main FilterMangleTest SDE-ffred
* @run main FilterMangleTest SDE-f*ratsx
* @run main FilterMangleTest SDE-fMangle.javax*
* @run driver FilterMangleTest
* @run driver FilterMangleTest SDE-pMangle.java*
* @run driver FilterMangleTest SDE-pMangle.jav*
* @run driver FilterMangleTest SDE-pMangle.j*
* @run driver FilterMangleTest SDE-p*Mangle.java
* @run driver FilterMangleTest SDE-p*angle.java
* @run driver FilterMangleTest SDE-p*java
* @run driver FilterMangleTest SDE-pMangle.xyz
* @run driver FilterMangleTest SDE-pIncl.rats*
* @run driver FilterMangleTest SDE-pIncl.rat*
* @run driver FilterMangleTest SDE-p*angle.rats
* @run driver FilterMangleTest SDE-f*Incl.rat
* @run driver FilterMangleTest SDE-ffred
* @run driver FilterMangleTest SDE-f*ratsx
* @run driver FilterMangleTest SDE-fMangle.javax*
*/
/*

Some files were not shown because too many files have changed in this diff Show More