sep_comp: remove unrobust SeparateRuntimeFunction::arguments attribute

[nit.git] / tests / tests.sh

diff --git a/tests/tests.sh b/tests/tests.sh
index 2769eba..95c06f5 100755 (executable)
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -35,7 +35,7 @@ JNI_LIB_PATH=`dirname ${paths[0]}`
 shopt -u nullglob
 
 outdir="out"
-compdir=".nit_compile"
+compdir="nit_compile"
 
 usage()
 {
@@ -48,7 +48,7 @@ Usage: $e [options] modulenames
 --engine    Use a specific engine (default=nitc)
 --noskip    Do not skip a test even if the .skip file matches
 --outdir    Use a specific output folder (default=out/)
---compdir   Use a specific temporary compilation folder (default=.nit_compile)
+--compdir   Use a specific temporary compilation folder (default=$compdir)
 --node      Run as a node in parallel, will not output context information
 --autosav   Copy the .res files directly in the sav folder overriding existing .res files
 END
@@ -395,30 +395,34 @@ enginebinname=$engine
 isinterpret=
 case $engine in
        nitc|nitg)
-               engine=nitg-s;
+               engine=nitcs;
                enginebinname=nitc;
                OPT="--separate $OPT --compile-dir $compdir"
-               savdirs="sav/nitg-common/"
+               savdirs="sav/nitc-common/"
                ;;
        nitcs|nitg-s)
+               engine=nitcs;
                enginebinname=nitc;
                OPT="--separate $OPT --compile-dir $compdir"
-               savdirs="sav/nitg-common/"
+               savdirs="sav/nitc-common/"
                ;;
        nitce|nitg-e)
+               engine=nitce;
                enginebinname=nitc;
                OPT="--erasure $OPT --compile-dir $compdir"
-               savdirs="sav/nitg-common/"
+               savdirs="sav/nitc-common/"
                ;;
        nitcsg|nitg-sg)
+               engine=nitcsg;
                enginebinname=nitc;
                OPT="--semi-global $OPT --compile-dir $compdir"
-               savdirs="sav/nitg-common/"
+               savdirs="sav/nitc-common/"
                ;;
        nitcg|nitg-g)
+               engine=nitcg;
                enginebinname=nitc;
                OPT="--global $OPT --compile-dir $compdir"
-               savdirs="sav/nitg-common/"
+               savdirs="sav/nitc-common/"
                ;;
        nit)
                engine=niti
@@ -437,11 +441,7 @@ case $engine in
        emscripten)
                enginebinname=nitc
                OPT="-m emscripten_nodejs.nit --semi-global $OPT --compile-dir $compdir"
-               savdirs="sav/nitg-sg/"
-               ;;
-       nitc)
-               echo "disabled engine $engine"
-               exit 0
+               savdirs="sav/nitcsg/"
                ;;
        *)
                echo "unknown engine $engine"
@@ -564,6 +564,8 @@ END
                                cat -- "$ff.compile.log"
                                cat >&2 -- "$ff.cmp.err"
                        fi
+                       # Clean
+                       rm -r "$compdir" 2>/dev/null
                fi
                if [ "$engine" = "emscripten" ]; then
                        echo > "$ff.bin" "nodejs $ffout \"\$@\""