summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2013-01-25 08:43:31 -0800
committerPaul Phillips <paulp@improving.org>2013-01-25 08:43:31 -0800
commitb8cb50d4205102573306bb09c26f1fb324b7a81b (patch)
tree87aa4792688fdd68c0d8bddd8fcaeae2207619ba
parentd82c9301f3486878652eeca05fa1e5c58d8fc82a (diff)
parent20d7a17ae843c9d0730b33e30ec878d2df63a3de (diff)
downloadscala-b8cb50d4205102573306bb09c26f1fb324b7a81b.tar.gz
scala-b8cb50d4205102573306bb09c26f1fb324b7a81b.tar.bz2
scala-b8cb50d4205102573306bb09c26f1fb324b7a81b.zip
Merge pull request #1913 from adriaanm/partest-script-no-deprecation
align partest script with ant
-rwxr-xr-xtest/partest5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/partest b/test/partest
index 391cc52fe0..6d9fc01cd5 100755
--- a/test/partest
+++ b/test/partest
@@ -83,7 +83,10 @@ fi
# last arg wins, so if JAVA_OPTS already contains -Xmx or -Xms the
# supplied argument will be used.
JAVA_OPTS="-Xmx1024M -Xms64M $JAVA_OPTS"
-[ -n "$SCALAC_OPTS" ] || SCALAC_OPTS="-deprecation"
+# the ant task doesn't supply any options by default,
+# so don't to that here either -- note that you may want to pass -optimise
+# to mimic what happens during nightlies
+# [ -n "$SCALAC_OPTS" ] || SCALAC_OPTS="-deprecation"
partestDebugStr=""
if [ ! -z "${PARTEST_DEBUG}" ] ; then