diff options
| author | mihaylov <mihaylov@epfl.ch> | 2008-02-14 06:34:05 +0000 |
|---|---|---|
| committer | mihaylov <mihaylov@epfl.ch> | 2008-02-14 06:34:05 +0000 |
| commit | c8fcd5202eae6104e42cb50fda0025b9c3b3b56d (patch) | |
| tree | 6df2bf57e3a5c073e9949485857cd29e21da02ba /test/scalatest | |
| parent | 67729af8d59c9bde12b426a552f010553d0d7726 (diff) | |
| download | scala-c8fcd5202eae6104e42cb50fda0025b9c3b3b56d.tar.gz scala-c8fcd5202eae6104e42cb50fda0025b9c3b3b56d.tar.bz2 scala-c8fcd5202eae6104e42cb50fda0025b9c3b3b56d.zip | |
Check for command-line option dependency AFTER ...
Check for command-line option dependency AFTER all command-line
arguments have been parsed. Avoids unnecessary dependency on the order
of the arguments
Diffstat (limited to 'test/scalatest')
| -rwxr-xr-x | test/scalatest | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/scalatest b/test/scalatest index 5b00c33830..f8f4ed7639 100755 --- a/test/scalatest +++ b/test/scalatest @@ -298,7 +298,7 @@ test_run_msil() { rm -f "$dstbase".$MSIL && rm -f "$dstbase".$EXE && - $SCALAC -nowarn -target:msil -Xassem "$os_dstbase" -Xassem-path $assemblies "$@" \ + $SCALAC -nowarn -Xassem "$os_dstbase" -Xassem-path $assemblies "$@" \ -sourcepath "$PREFIX/build/msil/src" "$os_srcbase".scala && case "$UNAME" in CYGWIN* ) @@ -755,7 +755,9 @@ while [ $# -gt 0 ]; do esac; done; -if [ "$JAVA5" = "false" -o "$TEST_TYPE" = "msil" ]; then +if [ "$TEST_TYPE" = "msil" ]; then + FLAGS="$FLAGS -target:msil"; +elif [ "$JAVA5" = "false" ]; then FLAGS="$FLAGS -target:jvm-1.4"; fi; |