diff options
| author | michelou <michelou@epfl.ch> | 2008-07-29 18:46:39 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2008-07-29 18:46:39 +0000 |
| commit | 8af4a26eadc33ecdae9f5e113711f262dc53714d (patch) | |
| tree | 173f4c7fe97540b0178bb1c3090447af0f951c01 /test | |
| parent | 753e15520ad1baf7a0eabaa78a6f6136de97f56b (diff) | |
| download | scala-8af4a26eadc33ecdae9f5e113711f262dc53714d.tar.gz scala-8af4a26eadc33ecdae9f5e113711f262dc53714d.tar.bz2 scala-8af4a26eadc33ecdae9f5e113711f262dc53714d.zip | |
fixed scalatest shootout on cygwin
Diffstat (limited to 'test')
| -rwxr-xr-x | test/scalatest | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/scalatest b/test/scalatest index ab823047f8..a42fb0c301 100755 --- a/test/scalatest +++ b/test/scalatest @@ -2,7 +2,7 @@ ############################################################################## # __ # # ________ ___ / / ___ Scala Tools Launch Script # -# / __/ __// _ | / / / _ | (c) 2002-2007, LAMP/EPFL # +# / __/ __// _ | / / / _ | (c) 2002-2008, LAMP/EPFL # # __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ # # /____/\___/_/ |_/____/_/ | | # # |/ # @@ -405,8 +405,9 @@ test_run_shootout() { $SCALAC -d "$os_dstbase".obj -cp "$ext_classpath" "$@" "$testfile" && scala_lib=`get_os_filename "$SCALA_LIB"` && classpath=`get_os_pathlist "$os_dstbase".obj:$CLASSPATH:$ext_classpath` && + src_dir=`get_os_filename "$srcdir"` && env JAVACMD="$JAVACMD" JAVA_OPTS="$javaopts" \ - $SCALA -Dscalatest.cwd="$srcdir" -Dscalatest.output=$os_dstbase.obj \ + $SCALA -Dscalatest.cwd="$src_dir" -Dscalatest.output=$os_dstbase.obj \ -Dscalatest.lib=$scala_lib -classpath "$classpath" Test && rm -rf "$dstbase".obj; } |