test/testlibrary/com/oracle/java/testlibrary/JDKToolFinder.java

Print this page
rev 5194 : 8014905: [TESTBUG] Some hotspot tests should be updated to divide test jdk and compile jdk
Summary: Change JDKToolFinder to look in compile.jdk if the executable cannot be found in test.jdk
Reviewed-by:


   6  * under the terms of the GNU General Public License version 2 only, as
   7  * published by the Free Software Foundation.
   8  *
   9  * This code is distributed in the hope that it will be useful, but WITHOUT
  10  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  11  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  12  * version 2 for more details (a copy is included in the LICENSE file that
  13  * accompanied this code).
  14  *
  15  * You should have received a copy of the GNU General Public License version
  16  * 2 along with this work; if not, write to the Free Software Foundation,
  17  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  18  *
  19  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  20  * or visit www.oracle.com if you need additional information or have any
  21  * questions.
  22  */
  23 
  24 package com.oracle.java.testlibrary;
  25 
  26 import java.io.File;

  27 
  28 public final class JDKToolFinder {
  29 
  30   private JDKToolFinder() {
  31   }
  32 
  33   /**
  34    * Returns the full path to an executable in jdk/bin based on System property
  35    * test.jdk (set by jtreg test suite)
  36    *
  37    * @return Full path to an executable in jdk/bin
  38    */
  39   public static String getJDKTool(String tool) {
  40     String binPath = System.getProperty("test.jdk");
  41     if (binPath == null) {
  42       throw new RuntimeException("System property 'test.jdk' not set. This property is normally set by jtreg. "



  43           + "When running test separately, set this property using '-Dtest.jdk=/path/to/jdk'.");
  44     }
  45 
  46     binPath += File.separatorChar + "bin" + File.separatorChar + tool;













  47 
  48     return binPath;
  49   }
  50 }


   6  * under the terms of the GNU General Public License version 2 only, as
   7  * published by the Free Software Foundation.
   8  *
   9  * This code is distributed in the hope that it will be useful, but WITHOUT
  10  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  11  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  12  * version 2 for more details (a copy is included in the LICENSE file that
  13  * accompanied this code).
  14  *
  15  * You should have received a copy of the GNU General Public License version
  16  * 2 along with this work; if not, write to the Free Software Foundation,
  17  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  18  *
  19  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  20  * or visit www.oracle.com if you need additional information or have any
  21  * questions.
  22  */
  23 
  24 package com.oracle.java.testlibrary;
  25 
  26 import java.nio.file.Path;
  27 import java.nio.file.Paths;
  28 
  29 public final class JDKToolFinder {
  30 
  31     private JDKToolFinder() {
  32     }
  33 
  34     /**
  35      * Returns the full path to an executable in jdk/bin based on System
  36      * property test.jdk or compile.jdk (both are set by the jtreg test suite)
  37      *
  38      * @return Full path to an executable in jdk/bin
  39      */
  40     public static String getJDKTool(String tool) {
  41         String compileJdkPath   = System.getProperty("compile.jdk");
  42         String testJdkPath      = System.getProperty("test.jdk");
  43 
  44         if (testJdkPath == null) {
  45             throw new RuntimeException(
  46                     "System property 'test.jdk' not set. This property is normally set by jtreg. "
  47                             + "When running test separately, set this property using '-Dtest.jdk=/path/to/jdk'.");
  48         }
  49 
  50         Path toolName = Paths.get("bin", tool + (Platform.isWindows() ? ".exe" : ""));
  51 
  52         // First try with test.jdk, if the tool can't be found there, check
  53         // compile.jdk
  54         Path testJdkTool = Paths.get(testJdkPath, toolName.toString());
  55         if (!testJdkTool.toFile().exists()) {
  56             Path compileJdkTool = Paths.get(compileJdkPath, toolName.toString());
  57             if (!compileJdkTool.toFile().exists()) {
  58                 throw new RuntimeException("Failed to find " + tool +
  59                         ", looked in test.jdk (" + testJdkTool.toAbsolutePath() +
  60                         ") and compile.jdk (" + compileJdkTool.toAbsolutePath() + ")");
  61             }
  62             return compileJdkTool.toAbsolutePath().toString();
  63         }
  64 
  65         return testJdkTool.toAbsolutePath().toString();
  66     }
  67 }