test/sun/tools/jhat/HatRun.java

*** 1,7 ****
  /*
!  * Copyright (c) 2005, 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.
*** 165,180 ****
                              (jre_home + File.separator + "..") :
                              jre_home );
          String cdir      = System.getProperty("test.classes", ".");
          String os_arch   = System.getProperty("os.arch");
          String os_name   = System.getProperty("os.name");
!         boolean d64      = os_name.equals("SunOS") && (
!                              os_arch.equals("sparcv9") ||
!                              os_arch.equals("amd64"));
!         String isa_dir   = d64?(File.separator+os_arch):"";
          String java      = jre_home
!                              + File.separator + "bin" + isa_dir
                               + File.separator + "java";
          String jhat      = sdk_home + File.separator + "bin"
                             + File.separator + "jhat";
          /* Array of strings to be passed in for exec:
           *   1. java
--- 165,177 ----
                              (jre_home + File.separator + "..") :
                              jre_home );
          String cdir      = System.getProperty("test.classes", ".");
          String os_arch   = System.getProperty("os.arch");
          String os_name   = System.getProperty("os.name");
!         boolean d64      = os_name.equals("SunOS");
          String java      = jre_home
!                              + File.separator + "bin"
                               + File.separator + "java";
          String jhat      = sdk_home + File.separator + "bin"
                             + File.separator + "jhat";
          /* Array of strings to be passed in for exec:
           *   1. java