summaryrefslogtreecommitdiff
path: root/test/partest
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2008-02-26 16:27:44 +0000
committermichelou <michelou@epfl.ch>2008-02-26 16:27:44 +0000
commite2d790348afa914fba28bc71775b818ef71ed1f5 (patch)
tree3bab5558d811951a01f6964dd02b897d89bf3e1a /test/partest
parenta447f3b97d90489d58b5f0d0d8765d41539ece9a (diff)
downloadscala-e2d790348afa914fba28bc71775b818ef71ed1f5.tar.gz
scala-e2d790348afa914fba28bc71775b818ef71ed1f5.tar.bz2
scala-e2d790348afa914fba28bc71775b818ef71ed1f5.zip
corrected EXT_CLASSPATH
Diffstat (limited to 'test/partest')
-rwxr-xr-xtest/partest18
1 files changed, 16 insertions, 2 deletions
diff --git a/test/partest b/test/partest
index e747595127..ebbc3ca487 100755
--- a/test/partest
+++ b/test/partest
@@ -41,9 +41,23 @@ fi
EXT_CLASSPATH=""
if [ -z "$EXT_CLASSPATH" ] ; then
if [ -f "$SCALA_HOME/lib/scala-partest.jar" ] ; then
- EXT_CLASSPATH="$SCALA_HOME/lib/scala-partest.jar"
+ for lib in `echo "scala-partest scala-library scala-compiler"`; do
+ ext="$SCALA_HOME/lib/$lib.jar"
+ if [ -z "$EXT_CLASSPATH" ] ; then
+ EXT_CLASSPATH="$ext"
+ else
+ EXT_CLASSPATH="$EXT_CLASSPATH:$ext"
+ fi
+ done
elif [ -d "$SCALA_HOME/build/quick/lib/partest" ] ; then
- EXT_CLASSPATH="$SCALA_HOME/build/quick/lib/partest"
+ for lib in `echo "partest library compiler"`; do
+ ext="$SCALA_HOME/build/quick/lib/$lib"
+ if [ -z "$EXT_CLASSPATH" ] ; then
+ EXT_CLASSPATH="$ext"
+ else
+ EXT_CLASSPATH="$EXT_CLASSPATH:$ext"
+ fi
+ done
fi
fi