summaryrefslogtreecommitdiff
path: root/test/partest
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2013-08-15 11:02:11 -0700
committerAdriaan Moors <adriaan.moors@typesafe.com>2013-08-15 11:02:11 -0700
commitb45f71e882ebfba6246712e790f4fba5acc6575c (patch)
tree101ef6eb2e0bd372b1e11fd11e61f958857c3997 /test/partest
parent5bdb828a2ef3fa874c2c19e8415d3d670c022ae1 (diff)
parent862daae957785cda1dd78b4b31a1d4d9874a82d1 (diff)
downloadscala-b45f71e882ebfba6246712e790f4fba5acc6575c.tar.gz
scala-b45f71e882ebfba6246712e790f4fba5acc6575c.tar.bz2
scala-b45f71e882ebfba6246712e790f4fba5acc6575c.zip
Merge pull request #2792 from ScrapCodes/partest-script-fixed
Bug fix ! , if $color_opts is unset partest script does not work.
Diffstat (limited to 'test/partest')
-rwxr-xr-xtest/partest5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/partest b/test/partest
index b74e04a208..8d94facba3 100755
--- a/test/partest
+++ b/test/partest
@@ -119,10 +119,13 @@ if [ ! -z "${PARTEST_DEBUG}" ] ; then
partestDebugStr="-Dpartest.debug=${PARTEST_DEBUG}"
fi
+# note that variables which may intentionally be empty must not
+# be quoted: otherwise an empty string will appear as a command line
+# argument, and java will think that is the program to run.
"${JAVACMD:=java}" \
$JAVA_OPTS -cp "$EXT_CLASSPATH" \
${partestDebugStr} \
- "$color_opts" \
+ ${color_opts} \
-Dfile.encoding=UTF-8 \
-Dscala.home="${SCALA_HOME}" \
-Dpartest.javacmd="${JAVACMD}" \