diff options
| author | mihaylov <mihaylov@epfl.ch> | 2005-10-04 13:26:55 +0000 |
|---|---|---|
| committer | mihaylov <mihaylov@epfl.ch> | 2005-10-04 13:26:55 +0000 |
| commit | eb6ce946a28bea61495d0263e0a2dfb4fe5adc85 (patch) | |
| tree | 3ee83622531ab2da3bddbf6bbfc204b880e120b6 | |
| parent | c1f0a81530c914b9ba8966b9d2efd233379dab27 (diff) | |
| download | scala-eb6ce946a28bea61495d0263e0a2dfb4fe5adc85.tar.gz scala-eb6ce946a28bea61495d0263e0a2dfb4fe5adc85.tar.bz2 scala-eb6ce946a28bea61495d0263e0a2dfb4fe5adc85.zip | |
If not running under Cygwin fall back to Mono f...
If not running under Cygwin fall back to Mono for the MSIL tests
| -rw-r--r-- | sources/bin/.scala_wrapper.tmpl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sources/bin/.scala_wrapper.tmpl b/sources/bin/.scala_wrapper.tmpl index 4d2ee19f47..c7ba730c98 100644 --- a/sources/bin/.scala_wrapper.tmpl +++ b/sources/bin/.scala_wrapper.tmpl @@ -714,7 +714,7 @@ test_run_dis() { # Tests the .NET backend. test_run_msil() { - assemblies=`get_os_filename {#TEST_ASSEMBLIES#}`; + assemblies=`get_os_pathlist {#TEST_ASSEMBLIES#}`; rm -f "$dstbase".il && rm -f "$dstbase".EXE && $SOCOS -nowarn -target:msil -o "$os_dstbase" -r $assemblies "$@" \ @@ -726,13 +726,14 @@ test_run_msil() { # peverify /il "$os_dstbase".EXE > /dev/null && "$dstbase".EXE "msil";; * ) - cat "$checkfile";; + ilasm /output:"$os_dstbase".EXE "$os_dstbase".il \ + > /dev/null && + mono "$dstbase".EXE "msil";; esac && rm -f "$dstbase".EXE && rm -f "$dstbase".il; } - # Checks the specified test. test_check_test() { [ $# = 1 ] || abort "internal error"; |