diff options
| author | Paul Phillips <paulp@improving.org> | 2010-05-06 16:37:13 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2010-05-06 16:37:13 +0000 |
| commit | c55b106f503d5e712e69823cfeb1cab2460221eb (patch) | |
| tree | a1af091d9a2eeb16ee4747930511db4996c47140 /test/partest | |
| parent | cb35c38f14f6a53c38966bde8e64dcfa9af17918 (diff) | |
| download | scala-c55b106f503d5e712e69823cfeb1cab2460221eb.tar.gz scala-c55b106f503d5e712e69823cfeb1cab2460221eb.tar.bz2 scala-c55b106f503d5e712e69823cfeb1cab2460221eb.zip | |
Rolled partest back to r21328.
changes necessary to plug it back in while preserving everything which
has happened since then in tests and such, but we should be the lookout
for overreversion. Review by phaller (but as a formality, I don't think
it requires direct review.)
Diffstat (limited to 'test/partest')
| -rwxr-xr-x | test/partest | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/test/partest b/test/partest index 87c7961689..1e7da8bd4a 100755 --- a/test/partest +++ b/test/partest @@ -75,23 +75,12 @@ if $cygwin; then fi # Reminder: substitution ${JAVA_OPTS:=-Xmx256M -Xms16M} DO NOT work on Solaris -[ -n "$JAVA_OPTS" ] || JAVA_OPTS="-Xms64M -Xmx1024M -Xss768K -XX:MaxPermSize=96M" -[ -n "$SCALAC_OPTS" ] || SCALAC_OPTS="" +[ -n "$JAVA_OPTS" ] || JAVA_OPTS="-Xmx512M -Xms16M" +[ -n "$SCALAC_OPTS" ] || SCALAC_OPTS="-deprecation" -# export SCALAC_OPTS -# export JAVA_OPTS -export JAVACMD - -${JAVACMD:=java} $JAVA_OPTS \ - -cp "$EXT_CLASSPATH" \ - -Dscala.home="${SCALA_HOME}" \ - scala.tools.partest.Runner "$@" +partestDebugStr="" +if [ ! -z "${PARTEST_DEBUG}" ] ; then + partestDebugStr="-Dpartest.debug=${PARTEST_DEBUG}" +fi -# ${JAVACMD:=java} $JAVA_OPTS \ -# -cp "$EXT_CLASSPATH" \ -# -Dscala.home="${SCALA_HOME}" \ -# -Dpartest.scalac_opts="${SCALAC_OPTS}" \ -# -Dpartest.javacmd="${JAVACMD}" \ -# -Dpartest.java_opts="${JAVA_OPTS}" \ -# -Dpartest.javac_cmd="${JAVA_HOME}/bin/javac" \ -# scala.tools.partest.Runner "$@" +${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 "$@" |