< prev index next >

test/hotspot/jtreg/vmTestbase/nsk/share/jdi/Binder.java

Print this page
*** 188,11 ***
                  + vmm.minorInterfaceVersion());
  
          Debugee debugee = null;
  
          String classPath = null;
! //        classPath = System.getProperty("java.class.path");
  
          prepareForPipeConnection(argumentHandler);
  
          if (argumentHandler.isLaunchedLocally()) {
  
--- 188,11 ---
                  + vmm.minorInterfaceVersion());
  
          Debugee debugee = null;
  
          String classPath = null;
!         classPath = System.getProperty("java.class.path");
  
          prepareForPipeConnection(argumentHandler);
  
          if (argumentHandler.isLaunchedLocally()) {
  

*** 685,10 ***
--- 685,11 ---
       * Make proper arguments for LaunchingConnector.
       */
      private Map<String,? extends Argument> setupLaunchingConnector(LaunchingConnector connector,
                                                  String classToExecute,
                                                  String classPath) {
+         display("ClassPath: " + classPath);
          display("LaunchingConnector:");
          display("    name: " + connector.name());
          display("    description: " + connector.description());
          display("    transport: " + connector.transport());
  

*** 708,10 ***
--- 709,14 ---
                              .toArray(String[]::new);
          }
  
          String cmdline = classToExecute + " " + ArgumentHandler.joinArguments(rawArgs, quote);
  
+         if(System.getProperty("main.wrapper") != null) {
+             cmdline = MainWrapper.class.getName() + " " + System.getProperty("main.wrapper") + " " + cmdline;
+         }
+ 
          arg = (Connector.StringArgument) arguments.get("main");
          arg.setValue(cmdline);
  
          if (! argumentHandler.willDebugeeSuspended()) {
              Connector.BooleanArgument barg = (Connector.BooleanArgument) arguments.get("suspend");

*** 733,23 ***
          if (! argumentHandler.isDefaultLaunchExecName()) {
              arg = (Connector.StringArgument) arguments.get("vmexec");
              arg.setValue(argumentHandler.getLaunchExecName());
          }
  
          String vmArgs = "";
  
          String vmUserArgs = argumentHandler.getLaunchOptions();
  
          if (vmUserArgs != null) {
              vmArgs = vmUserArgs;
          }
  
! /*
          if (classPath != null) {
              vmArgs += " -classpath " + quote + classPath + quote;
          }
-  */
  
          if (vmArgs.length() > 0) {
              arg = (Connector.StringArgument) arguments.get("options");
              arg.setValue(vmArgs);
          }
--- 738,27 ---
          if (! argumentHandler.isDefaultLaunchExecName()) {
              arg = (Connector.StringArgument) arguments.get("vmexec");
              arg.setValue(argumentHandler.getLaunchExecName());
          }
  
+         // vthread fixme: at some point we are going to have to be able to pass tests
+         // without having this flag turned on.
+         arg = (Connector.StringArgument) arguments.get("enumeratevthreads");
+         arg.setValue("y");
+ 
          String vmArgs = "";
  
          String vmUserArgs = argumentHandler.getLaunchOptions();
  
          if (vmUserArgs != null) {
              vmArgs = vmUserArgs;
          }
  
! 
          if (classPath != null) {
              vmArgs += " -classpath " + quote + classPath + quote;
          }
  
          if (vmArgs.length() > 0) {
              arg = (Connector.StringArgument) arguments.get("options");
              arg.setValue(vmArgs);
          }
< prev index next >