summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2006-01-27 12:43:58 +0000
committermichelou <michelou@epfl.ch>2006-01-27 12:43:58 +0000
commit0d6dd0105811a15ba8370de58b8875cc4f61ab9e (patch)
treeb72b940d74d304200fedfc1c54e960503c8da4de /test
parentc57219d240fd3188bf1c4c2edd7af9c3d31c18ce (diff)
downloadscala-0d6dd0105811a15ba8370de58b8875cc4f61ab9e.tar.gz
scala-0d6dd0105811a15ba8370de58b8875cc4f61ab9e.tar.bz2
scala-0d6dd0105811a15ba8370de58b8875cc4f61ab9e.zip
- corrected classpath on Cygwin in file test/sc...
- corrected classpath on Cygwin in file test/scalatest now displays 3rd - line of 'java -version'
Diffstat (limited to 'test')
-rwxr-xr-xtest/scalatest7
1 files changed, 4 insertions, 3 deletions
diff --git a/test/scalatest b/test/scalatest
index de48626fa0..d254133f7f 100755
--- a/test/scalatest
+++ b/test/scalatest
@@ -221,7 +221,8 @@ test_run_jvm() {
rm -rf "$dstbase".obj &&
mkdir -p "$dstbase".obj &&
$SOCOS -d "$os_dstbase".obj "$@" "$os_srcbase".scala &&
- $SCALA -classpath "$os_dstbase".obj:$CLASSPATH Test "jvm" &&
+ classpath=`get_os_pathlist "$os_dstbase".obj:$CLASSPATH` &&
+ $SCALA -classpath $classpath Test "jvm" &&
rm -rf "$dstbase".obj;
}
@@ -537,8 +538,8 @@ fi
printf_outline "Source directory is : $SRCDIR\\n";
printf_outline "Scala binaries in : $BIN_DIR\\n";
-JVM_VERSION=`${JAVA_CMD:=java} -version 2>&1 | head -2 | tail -1`
-printf_outline "Java runtime is : $JVM_VERSION\\n\\n";
+jvm_version=`${JAVA_CMD:=java} -version 2>&1 | head -3 | tail -1`
+printf_outline "Java runtime is : $jvm_version\\n\\n";
test_check_all;