test/demo/jvmti/DemoRun.java

*** 1,7 ****
  /*
!  * Copyright (c) 2004, 2012, 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) 2004, 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.
*** 123,140 ****
          String os_arch   = System.getProperty("os.arch");
          String os_name   = System.getProperty("os.name");
          String libprefix = os_name.contains("Windows")?"":"lib";
          String libsuffix = os_name.contains("Windows")?".dll":
                                  os_name.contains("OS X")?".dylib":".so";
!         boolean d64      =    ( os_name.contains("Solaris") ||
!                                 os_name.contains("SunOS") )
!                            && ( os_arch.equals("sparcv9") ||
!                                 os_arch.equals("amd64"));
          boolean hprof    = demo_name.equals("hprof");
-         String isa_dir   = d64?(File.separator+os_arch):"";
          String java      = jre_home
!                              + File.separator + "bin" + isa_dir
                               + File.separator + "java";
          /* Array of strings to be passed in for exec:
           *   1. java
           *   2. -Dtest.classes=.
           *   3. -d64                 (optional)
--- 123,136 ----
          String os_arch   = System.getProperty("os.arch");
          String os_name   = System.getProperty("os.name");
          String libprefix = os_name.contains("Windows")?"":"lib";
          String libsuffix = os_name.contains("Windows")?".dll":
                                  os_name.contains("OS X")?".dylib":".so";
!         boolean d64      = os_name.contains("Solaris");
          boolean hprof    = demo_name.equals("hprof");
          String java      = jre_home
!                              + File.separator + "bin"
                               + File.separator + "java";
          /* Array of strings to be passed in for exec:
           *   1. java
           *   2. -Dtest.classes=.
           *   3. -d64                 (optional)
*** 176,186 ****
          } else {
              String libname  = sdk_home
                           + File.separator + "demo"
                           + File.separator + "jvmti"
                           + File.separator + demo_name
!                          + File.separator + "lib" + isa_dir
                           + File.separator + libprefix + demo_name + libsuffix;
              cmdLine += " ";
              cmdLine += (cmd[i++] = "-agentpath:" + libname
                       + (demo_options.equals("")?"":("="+demo_options)));
          }
--- 172,182 ----
          } else {
              String libname  = sdk_home
                           + File.separator + "demo"
                           + File.separator + "jvmti"
                           + File.separator + demo_name
!                          + File.separator + "lib"
                           + File.separator + libprefix + demo_name + libsuffix;
              cmdLine += " ";
              cmdLine += (cmd[i++] = "-agentpath:" + libname
                       + (demo_options.equals("")?"":("="+demo_options)));
          }