diff options
| author | Philipp Haller <hallerp@gmail.com> | 2008-02-27 14:54:23 +0000 |
|---|---|---|
| committer | Philipp Haller <hallerp@gmail.com> | 2008-02-27 14:54:23 +0000 |
| commit | 3b35b45b6f34aad38acbbf958de056181a785ddc (patch) | |
| tree | 408d0a678439ee8b0f7c663bd0c1228ddf2d23f2 /test/partest | |
| parent | 1ed83a9ccda9af0fb0471d6218a3ea69fb227775 (diff) | |
| download | scala-3b35b45b6f34aad38acbbf958de056181a785ddc.tar.gz scala-3b35b45b6f34aad38acbbf958de056181a785ddc.tar.bz2 scala-3b35b45b6f34aad38acbbf958de056181a785ddc.zip | |
partest does not use STARR library any more
Diffstat (limited to 'test/partest')
| -rwxr-xr-x | test/partest | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/test/partest b/test/partest index 62030d2571..9a72e5e232 100755 --- a/test/partest +++ b/test/partest @@ -49,7 +49,8 @@ if [ -z "$EXT_CLASSPATH" ] ; then fi done elif [ -d "$SCALA_HOME/build/quick/lib/partest" ] ; then - for ext in `ls -d "$SCALA_HOME"/build/quick/lib/*` ; do + for lib in `echo "partest library compiler actors fjbg.jar"`; do + ext="$SCALA_HOME/build/quick/lib/$lib" if [ -z "$EXT_CLASSPATH" ] ; then EXT_CLASSPATH="$ext" else @@ -59,16 +60,6 @@ if [ -z "$EXT_CLASSPATH" ] ; then fi fi -# Setting the boot class-path to be the standard library (either as a JAR or a folder) -BOOT_CLASSPATH="" -if [ -z "$BOOT_CLASSPATH" ] ; then - if [ -f "$SCALA_HOME/lib/scala-library.jar" ] ; then - BOOT_CLASSPATH="$SCALA_HOME/lib/scala-library.jar" - elif [ -d "$SCALA_HOME/lib/library" ] ; then - BOOT_CLASSPATH="$SCALA_HOME/lib/library" - fi -fi - if $cygwin; then if [ "$OS" = "Windows_NT" ] && cygpath -m .>/dev/null 2>/dev/null ; then format=mixed @@ -77,11 +68,10 @@ if $cygwin; then fi SCALA_HOME=`cygpath --$format "$SCALA_HOME"` EXT_CLASSPATH=`cygpath --path --$format "$EXT_CLASSPATH"` - BOOT_CLASSPATH=`cygpath --path --$format "$BOOT_CLASSPATH"` fi # Reminder: substitution ${JAVA_OPTS:=-Xmx256M -Xms16M} DO NOT work on Solaris [ -n "$JAVA_OPTS" ] || JAVA_OPTS="-Xmx256M -Xms16M" [ -n "$SCALAC_OPTS" ] || SCALAC_OPTS="-deprecation" -${JAVACMD:=java} $JAVA_OPTS -Xbootclasspath/a:"$BOOT_CLASSPATH" -cp "$EXT_CLASSPATH" -Dscala.home="${SCALA_HOME}" -Dscalatest.javacmd="${JAVACMD}" -Dscalatest.java_options="${JAVA_OPTS}" -Dscalatest.scalac_options="${SCALAC_OPTS}" scala.tools.partest.nest.NestRunner "$@" +${JAVACMD:=java} $JAVA_OPTS -cp "$EXT_CLASSPATH" -Dscala.home="${SCALA_HOME}" -Dscalatest.javacmd="${JAVACMD}" -Dscalatest.java_options="${JAVA_OPTS}" -Dscalatest.scalac_options="${SCALAC_OPTS}" scala.tools.partest.nest.NestRunner "$@" |