improved MSIL support in the test/scalatest script

1 files changed, 14 insertions, 11 deletions

diff --git a/test/scalatest b/test/scalatest
index 1123d49754..a9dc13cc79 100755
--- a/test/scalatest
+++ b/test/scalatest
@@ -273,26 +273,29 @@ test_run_dis() {
     rm -rf "$dstbase".obj;
 }
 
+MSIL="msil"
+EXE="exe"
 # Tests the .NET backend.
 test_run_msil() {
-    assemblies=`get_os_pathlist "/home/linuxsoft/apps/msil"`;
-    rm -f "$dstbase".il &&
-    rm -f "$dstbase".EXE &&
+    assemblies=`get_os_pathlist ./predef.dll`;
+    rm -f "$dstbase".$MSIL &&
+    rm -f "$dstbase".$EXE &&
+
     $SCALAC -nowarn -target:msil -o "$os_dstbase" -r $assemblies "$@" \
-        "$os_srcbase".scala &&
+        -sourcepath "$PREFIX/src/dotnet-library" "$os_srcbase".scala &&
     case "$UNAME" in
         CYGWIN* )
-            ilasm /qui /nol /out="$os_dstbase".EXE "$os_dstbase".il \
+            ilasm /qui /nol /out="$os_dstbase".$EXE "$os_dstbase".$MSIL \
                 > /dev/null &&
 #             peverify /il "$os_dstbase".EXE > /dev/null &&
-            "$dstbase".EXE "msil";;
+            "$dstbase".$EXE_SUFFIX "msil";;
         * )
-            ilasm /output:"$os_dstbase".EXE "$os_dstbase".il \
+            ilasm /output:"$os_dstbase".$EXE "$os_dstbase".$MSIL \
                 > /dev/null &&
-            mono "$dstbase".EXE "msil";;
+            mono "$dstbase.$EXE" "msil";;
     esac &&
-    rm -f "$dstbase".EXE &&
-    rm -f "$dstbase".il;
+    rm -f "$dstbase".$EXE &&
+    rm -f "$dstbase".$MSIL;
 }
 
 # Tests a script with Scala code embedded in it
@@ -635,7 +638,7 @@ while [ $# -gt 0 ]; do
     esac;
 done;
 
-if [ "$JAVA5" = "true" ]; then
+if [ "$JAVA5" = "true" -a "$TEST_TYPE" != "msil" ]; then
     FLAGS="$FLAGS -target:jvm-1.5"
 fi;