Merged revisions 21810-21811,21816-21818,21826,...

Merged revisions 21810-21811,21816-21818,21826,21829 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk

........
  r21810 | imaier | 2010-05-05 11:59:25 +0200 (Wed, 05 May 2010) | 1 line

  Fixed #3358. Added explicit expected types to cachedWrapper calls,
deprecated explicit resizing of UIElements. ........ r21811 | rytz |
2010-05-05 13:53:31 +0200 (Wed, 05 May 2010) | 1 line

  revert the revert of r21791 (fix constructor parameter annotations).
close #3390. together with a new starr it builds. no review. ........
r21816 | extempore | 2010-05-05 18:56:55 +0200 (Wed, 05 May 2010) | 2
lines

  Rolled back a subset of partest to use StreamAppender and avoid
io.Process. No review. ........ r21817 | dragos | 2010-05-05 19:59:21
+0200 (Wed, 05 May 2010) | 3 lines

  Tightened what gets specialized: only when the type parameter appears
at top level, or as a type argument to a Java array. For example T,
Array[T] cause specialization, but List[T] does not. Resurrected
spec-matrix, forgotten among the disabled tests. No review. ........
r21818 | dragos | 2010-05-05 20:26:17 +0200 (Wed, 05 May 2010) | 1 line

  Removed some logging and prune CollectMethodBodies to not traverse
more than necessary. No review. ........ r21826 | extempore | 2010-05-06
16:57:56 +0200 (Thu, 06 May 2010) | 1 line

  Fixed bug in transpose, closes #3397, no review.
........
  r21829 | extempore | 2010-05-06 18:37:13 +0200 (Thu, 06 May 2010) | 5 lines

  Rolled partest back to r21328. Attempted to make the minimum 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.) ........

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  "$@"