RFR: [XS] JDK-8217395: Update langtools shell tests to use ${EXE_SUFFIX}

Jonathan Gibbons jonathan.gibbons at oracle.com
Fri Jan 18 19:53:43 UTC 2019


Please review this small change to have langtools shell tests support 
the use of ${EXE_SUFFIX} to allow the optional use of .exe as a suffix 
in the path for Windows binaries in shell scripts.

langtools has only a few shell tests remaining, all in a single 
directory, and all using a single shared setup script.

The change is small enough to be given inline, below.  The change is 
benign if EXE_SUFFIX is not set; it is assumed that the variable will be 
set if needed when the test run.

-- Jon


JBS: https://bugs.openjdk.java.net/browse/JDK-8217395


$ hg diff
diff -r a99bd2570660 test/langtools/tools/javac/Paths/Util.sh
--- a/test/langtools/tools/javac/Paths/Util.sh  Fri Jan 18 11:26:30 2019 
-0800
+++ b/test/langtools/tools/javac/Paths/Util.sh  Fri Jan 18 11:39:31 2019 
-0800
@@ -24,10 +24,10 @@
  # Utilities for shell tests

  : ${TESTSRC=.} ${TESTCLASSES=.}
-  java="${TESTJAVA+${TESTJAVA}/bin/}java"
- javac="${TESTJAVA+${TESTJAVA}/bin/}javac"
-   jar="${TESTJAVA+${TESTJAVA}/bin/}jar"
-jimage="${TESTJAVA+${TESTJAVA}/bin/}jimage"
+  java="${TESTJAVA+${TESTJAVA}/bin/}java${EXE_SUFFIX}"
+ javac="${TESTJAVA+${TESTJAVA}/bin/}javac${EXE_SUFFIX}"
+   jar="${TESTJAVA+${TESTJAVA}/bin/}jar${EXE_SUFFIX}"
+jimage="${TESTJAVA+${TESTJAVA}/bin/}jimage${EXE_SUFFIX}"

  case `uname -s` in
    Windows*|CYGWIN*)



More information about the compiler-dev mailing list