Merge: Neo4j: bug fixes and improvments

[nit.git] / tests / tests.sh

diff --git a/tests/tests.sh b/tests/tests.sh
index 5672bc1..5bdefd2 100755 (executable)
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -19,7 +19,9 @@
 
 # Set lang do default to avoid failed tests because of locale
 export LANG=C
+export LC_ALL=C
 export NIT_TESTING=true
+export MNIT_SRAND=0
 
 unset NIT_DIR
 
@@ -235,7 +237,7 @@ need_skip()
                echo >>$xml "<testcase classname='$3' name='$2'><skipped/></testcase>"
                return 0
        fi
-       if test $engine = niti && echo "$1" | grep -f "exec.skip" >/dev/null 2>&1; then
+       if test -n "$isinterpret" && echo "$1" | grep -f "exec.skip" >/dev/null 2>&1; then
                echo "=> $2: [skip exec]"
                echo >>$xml "<testcase classname='$3' name='$2'><skipped/></testcase>"
                return 0
@@ -290,6 +292,7 @@ while [ $stop = false ]; do
        esac
 done
 enginebinname=$engine
+isinterpret=
 case $engine in
        nitg)
                engine=nitg-s;
@@ -314,9 +317,15 @@ case $engine in
                ;;
        nit)
                engine=niti
+               isinterpret=true
                ;;
        niti)
                enginebinname=nit
+               isinterpret=true
+               ;;
+       nitvm)
+               isinterpret=true
+               savdirs="sav/niti/"
                ;;
        emscripten)
                enginebinname=nitg
@@ -410,8 +419,10 @@ for ii in "$@"; do
 
                if [ -f "$f.inputs" ]; then
                        inputs="$f.inputs"
+                       export MNIT_READ_INPUT="$f.inputs"
                else
                        inputs=/dev/null
+                       export MNIT_READ_INPUT=/dev/null
                fi
 
                ffout="$ff.bin"
@@ -419,7 +430,7 @@ for ii in "$@"; do
                        ffout="$ff.bin.js"
                fi
 
-               if [ "$engine" = "niti" ]; then
+               if [ -n "$isinterpret" ]; then
                        cat > "./$ff.bin" <<END
 exec $NITC --no-color $OPT "$i" $includes -- "\$@"
 END
@@ -459,16 +470,18 @@ END
                        echo -n "! "
                        cat "$ff.compile.log" "$ff.cmp.err" > "$ff.res"
                        process_result $bf $bf $pack
-               elif skip_exec "$bf"; then
-                       # No exec
-                       > "$ff.res"
-                       process_result $bf $bf $pack
                elif [ -n "$nocc" ]; then
                        # not compiled
                        echo -n "nocc "
                        > "$ff.res"
                        process_result $bf $bf $pack
                elif [ -x "./$ff.bin" ]; then
+                       if skip_exec "$bf"; then
+                               # No exec
+                               > "$ff.res"
+                               process_result $bf $bf $pack
+                               break
+                       fi
                        echo -n ". "
                        # Execute
                        args=""