diff options
| author | michelou <michelou@epfl.ch> | 2006-10-07 08:14:32 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2006-10-07 08:14:32 +0000 |
| commit | 5c21476c57df9bf80f8c9cd0fad970e8b423f46e (patch) | |
| tree | 35a987a4db67cae2d96b9d939c91d0cd80ca1a4f | |
| parent | 83b51eccb8dd72b5d5cffdd5c9b04f73dd292392 (diff) | |
| download | scala-5c21476c57df9bf80f8c9cd0fad970e8b423f46e.tar.gz scala-5c21476c57df9bf80f8c9cd0fad970e8b423f46e.tar.bz2 scala-5c21476c57df9bf80f8c9cd0fad970e8b423f46e.zip | |
fixed OS-specific variables in test_run_jvm() o...
fixed OS-specific variables in test_run_jvm() on Cygwin
| -rwxr-xr-x | test/scalatest | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/scalatest b/test/scalatest index 841ce0a106..e8290df57e 100755 --- a/test/scalatest +++ b/test/scalatest @@ -224,8 +224,9 @@ test_run_jvm() { rm -rf "$dstbase".obj && mkdir -p "$dstbase".obj && $SCALAC -d "$os_dstbase".obj "$@" "$os_srcbase".scala && + scala_lib=`get_os_filename "$SCALA_LIB"` && classpath=`get_os_pathlist "$os_dstbase".obj:$CLASSPATH` && - $SCALA -Dscalatest.output=$dstbase.obj -Dscalatest.lib=$SCALA_LIB -classpath $classpath Test "jvm" && + $SCALA -Dscalatest.output=$os_dstbase.obj -Dscalatest.lib=$scala_lib -classpath $classpath Test "jvm" && rm -rf "$dstbase".obj; } |