From 3b35b45b6f34aad38acbbf958de056181a785ddc Mon Sep 17 00:00:00 2001
From: Philipp Haller <hallerp@gmail.com>
Date: Wed, 27 Feb 2008 14:54:23 +0000
Subject: partest does not use STARR library any more

---
 test/partest | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

(limited to 'test')

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  "$@"
-- 
cgit v1.2.3