summaryrefslogtreecommitdiff
path: root/test/partest
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2010-02-17 21:37:08 +0000
committerPaul Phillips <paulp@improving.org>2010-02-17 21:37:08 +0000
commitf83314aa82f5b5546ad19d2b037fc4cfb9af6826 (patch)
tree5dd6db30e01a9f9bbafe54b9a3dd190dc0284e18 /test/partest
parent0e439d6d308e54af6d97853b4ef55f20b77c98e1 (diff)
downloadscala-f83314aa82f5b5546ad19d2b037fc4cfb9af6826.tar.gz
scala-f83314aa82f5b5546ad19d2b037fc4cfb9af6826.tar.bz2
scala-f83314aa82f5b5546ad19d2b037fc4cfb9af6826.zip
...and managed to miss the key file in getting ...
...and managed to miss the key file in getting past partest. No review.
Diffstat (limited to 'test/partest')
-rwxr-xr-xtest/partest7
1 files changed, 6 insertions, 1 deletions
diff --git a/test/partest b/test/partest
index 1405efa0c0..6c0190dd31 100755
--- a/test/partest
+++ b/test/partest
@@ -78,4 +78,9 @@ fi
[ -n "$JAVA_OPTS" ] || JAVA_OPTS="-Xmx512M -Xms16M"
[ -n "$SCALAC_OPTS" ] || SCALAC_OPTS="-deprecation"
-${JAVACMD:=java} $JAVA_OPTS -cp "$EXT_CLASSPATH" -Dpartest.debug="${PARTEST_DEBUG}" -Dscala.home="${SCALA_HOME}" -Dscalatest.javacmd="${JAVACMD}" -Dscalatest.java_opts="${JAVA_OPTS}" -Dscalatest.scalac_opts="${SCALAC_OPTS}" -Dscalatest.javac_cmd="${JAVA_HOME}/bin/javac" scala.tools.partest.nest.NestRunner "$@"
+partestDebugStr=""
+if [ ! -z "${PARTEST_DEBUG}" ] ; then
+ partestDebugStr="-Dpartest.debug=${PARTEST_DEBUG}"
+fi
+
+${JAVACMD:=java} $JAVA_OPTS -cp "$EXT_CLASSPATH" ${partestDebugStr} -Dscala.home="${SCALA_HOME}" -Dscalatest.javacmd="${JAVACMD}" -Dscalatest.java_opts="${JAVA_OPTS}" -Dscalatest.scalac_opts="${SCALAC_OPTS}" -Dscalatest.javac_cmd="${JAVA_HOME}/bin/javac" scala.tools.partest.nest.NestRunner "$@"