diff options
Diffstat (limited to 'test/partest')
| -rwxr-xr-x | test/partest | 18 |
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 |