summaryrefslogtreecommitdiff
path: root/test/scalatest
diff options
context:
space:
mode:
Diffstat (limited to 'test/scalatest')
-rwxr-xr-xtest/scalatest6
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;