diff options
| author | Paul Phillips <paulp@improving.org> | 2011-06-10 17:32:05 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-06-10 17:32:05 +0000 |
| commit | 4e85b6fb33baad9910b3d776867dc16c2816acdf (patch) | |
| tree | e92d9829e239cb1744f688a7831d3f83c291fc8b /test/partest | |
| parent | 07fab88cee34e5f59cf88f0dc8e61f2b8817eb24 (diff) | |
| download | scala-4e85b6fb33baad9910b3d776867dc16c2816acdf.tar.gz scala-4e85b6fb33baad9910b3d776867dc16c2816acdf.tar.bz2 scala-4e85b6fb33baad9910b3d776867dc16c2816acdf.zip | |
Tweaks repl tests to enforce -Yrepl-sync and ot...
Tweaks repl tests to enforce -Yrepl-sync and other setup on all clients.
Also includes some more why-do-tests-hang bosons for the particle
accelerator in case that doesn't wrap it up. I think it will though,
because now constrained-types is the only one which failed and it's also
the only one which overrides Settings. No review.
Diffstat (limited to 'test/partest')
| -rwxr-xr-x | test/partest | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/test/partest b/test/partest index 44f7130968..ebf6891fdc 100755 --- a/test/partest +++ b/test/partest @@ -74,7 +74,9 @@ if $cygwin; then EXT_CLASSPATH=`cygpath --path --$format "$EXT_CLASSPATH"` fi -[ -n "$JAVA_OPTS" ] || JAVA_OPTS="-Xmx1024M -Xms16M" +# 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" partestDebugStr="" @@ -82,4 +84,12 @@ if [ ! -z "${PARTEST_DEBUG}" ] ; then partestDebugStr="-Dpartest.debug=${PARTEST_DEBUG}" fi -${JAVACMD:=java} $JAVA_OPTS -cp "$EXT_CLASSPATH" ${partestDebugStr} -Dscala.home="${SCALA_HOME}" -Dpartest.javacmd="${JAVACMD}" -Dpartest.java_opts="${JAVA_OPTS}" -Dpartest.scalac_opts="${SCALAC_OPTS}" -Dpartest.javac_cmd="${JAVA_HOME}/bin/javac" scala.tools.partest.nest.NestRunner "$@" +${JAVACMD:=java} \ + $JAVA_OPTS -cp "$EXT_CLASSPATH" \ + ${partestDebugStr} \ + -Dscala.home="${SCALA_HOME}" \ + -Dpartest.javacmd="${JAVACMD}" \ + -Dpartest.java_opts="${JAVA_OPTS}" \ + -Dpartest.scalac_opts="${SCALAC_OPTS}" \ + -Dpartest.javac_cmd="${JAVA_HOME}/bin/javac" \ + scala.tools.partest.nest.NestRunner "$@" |