test/com/sun/jdi/DoubleAgentTest.java

*** 1,7 ****
  /*
!  * Copyright (c) 2005, 2006, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2005, 2013, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 88,107 ****
      /*
       * Launch a server debuggee with the given address
       */
      private static Process launch(String address, String class_name) throws IOException {
          String exe =   System.getProperty("java.home")
!                      + File.separator + "bin" + File.separator;
!         String arch = System.getProperty("os.arch");
!         String osname = System.getProperty("os.name");
!         if (osname.equals("SunOS") && arch.equals("sparcv9")) {
!             exe += "sparcv9/java";
!         } else if (osname.equals("SunOS") && arch.equals("amd64")) {
!             exe += "amd64/java";
!         } else {
!             exe += "java";
!         }
          String jdwpOption = "-agentlib:jdwp=transport=dt_socket"
                           + ",server=y" + ",suspend=y" + ",address=" + address;
          String cmd = exe + " " + VMConnection.getDebuggeeVMOptions()
                           + " " + jdwpOption
                           + " " + jdwpOption
--- 88,98 ----
      /*
       * Launch a server debuggee with the given address
       */
      private static Process launch(String address, String class_name) throws IOException {
          String exe =   System.getProperty("java.home")
!                      + File.separator + "bin" + File.separator + "java";
          String jdwpOption = "-agentlib:jdwp=transport=dt_socket"
                           + ",server=y" + ",suspend=y" + ",address=" + address;
          String cmd = exe + " " + VMConnection.getDebuggeeVMOptions()
                           + " " + jdwpOption
                           + " " + jdwpOption