tests: compile dir is `nit_compile`, and cleannit

[nit.git] / tests / tests.sh

diff --git a/tests/tests.sh b/tests/tests.sh
index 77e116b..3fd5510 100755 (executable)
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -21,7 +21,7 @@
 export LANG=C
 export LC_ALL=C
 export NIT_TESTING=true
-export MNIT_SRAND=0
+export NIT_SRAND=0
 
 unset NIT_DIR
 
@@ -35,7 +35,7 @@ JNI_LIB_PATH=`dirname ${paths[0]}`
 shopt -u nullglob
 
 outdir="out"
-compdir=".nit_compile"
+compdir="nit_compile"
 
 usage()
 {
@@ -45,11 +45,12 @@ Usage: $e [options] modulenames
 -o option   Pass option to the engine
 -v          Verbose (show tests steps)
 -h          This help
---engine    Use a specific engine (default=nitg)
+--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
 }
 
@@ -69,7 +70,9 @@ saferun()
                        *) stop=true
                esac
        done
-       if test -n "$TIME"; then
+       if test -d "$1"; then
+               find $1 | sort
+       elif test -n "$TIME"; then
                $TIME -o "$o" $a $TIMEOUT "$@"
        else
                if test -n "$a"; then echo 0 >> "$o"; else echo 0 > "$o"; fi
@@ -232,6 +235,7 @@ function process_result()
                        echo "[*ok*] $outdir/$pattern.res $SAV - but $OLD remains!"
                        echo >>$xml "<error message='`xmlesc "ok $outdir/$pattern.res - but $OLD remains"`'/>"
                        remains="$remains $OLD"
+                       test "$autosav" = "true" && rm "$OLD"
                else
                        echo "[ok] $outdir/$pattern.res $SAV"
                fi
@@ -241,6 +245,7 @@ function process_result()
                        echo "[*fixme*] $outdir/$pattern.res $FIXME - but $OLD remains!"
                        echo >>$xml "<error message='`xmlesc "ok $outdir/$pattern.res - but $OLD remains"`'/>"
                        remains="$remains $OLD"
+                       test "$autosav" = "true" && rm "$OLD"
                else
                        echo "[fixme] $outdir/$pattern.res $FIXME"
                        echo >>$xml "<skipped/>"
@@ -258,6 +263,7 @@ function process_result()
                echo >>$xml "]]></system-out>"
                nok="$nok $pattern"
                echo "$ii" >> "$ERRLIST"
+               test "$autosav" = "true" && cp "$outdir/$pattern.res" "$SOSO"
        elif [ -n "$SOSOF" ]; then
                echo "[======= fixme soso $outdir/$pattern.res $SOSOF =======]"
                echo >>$xml "<error message='`xmlesc "soso $outdir/$pattern.res $SOSO"`'/>"
@@ -266,6 +272,7 @@ function process_result()
                echo >>$xml "]]></system-out>"
                nok="$nok $pattern"
                echo "$ii" >> "$ERRLIST"
+               test "$autosav" = "true" && cp "$outdir/$pattern.res" && "$SOSO"
        elif [ -n "$NSAV" ]; then
                echo "[======= fail $outdir/$pattern.res $NSAV =======]"
                echo >>$xml "<error message='`xmlesc "fail $outdir/$pattern.res $NSAV"`'/>"
@@ -274,6 +281,7 @@ function process_result()
                echo >>$xml "]]></system-out>"
                nok="$nok $pattern"
                echo "$ii" >> "$ERRLIST"
+               test "$autosav" = "true" && cp "$outdir/$pattern.res" "$NSAV"
        elif [ -n "$NFIXME" ]; then
                echo "[======= changed $outdir/$pattern.res $NFIXME ======]"
                echo >>$xml "<error message='`xmlesc "changed $outdir/$pattern.res $NFIXME"`'/>"
@@ -282,6 +290,7 @@ function process_result()
                echo >>$xml "]]></system-out>"
                nok="$nok $pattern"
                echo "$ii" >> "$ERRLIST"
+               test "$autosav" = "true" && cp "$outdir/$pattern.res" "$NFIXME"
        elif [ -s "$outdir/$pattern.res" ]; then
                echo "[=== no sav ===] $outdir/$pattern.res is not empty"
                echo >>$xml "<error message='no sav and not empty'/>"
@@ -290,6 +299,7 @@ function process_result()
                echo >>$xml "]]></system-out>"
                nos="$nos $pattern"
                echo "$ii" >> "$ERRLIST"
+               test "$autosav" = "true" && cp "$outdir/$pattern.res" "sav/"
        else
                # no sav but empty res
                echo "[0k] $outdir/$pattern.res is empty"
@@ -319,7 +329,7 @@ need_skip()
 
        # Skip by OS
        os_skip_file=`uname`.skip
-       if test -e $os_skip_file && echo "$1" | grep -f "$os_skip_file"; then
+       if test -e $os_skip_file && echo "$1" | grep -f "$os_skip_file" >/dev/null 2>&1; then
                echo "=> $2: [skip os]"
                echo >>$xml "<testcase classname='`xmlesc "$3"`' name='`xmlesc "$2"`' `timestamp`><skipped/></testcase>"
                return 0
@@ -362,8 +372,9 @@ find_nitc()
 
 verbose=false
 isnode=false
+autosav=false
 stop=false
-engine=nitg
+engine=nitc
 noskip=
 savdirs=
 while [ $stop = false ]; do
@@ -376,35 +387,36 @@ while [ $stop = false ]; do
                --outdir) outdir="$2"; shift; shift;;
                --compdir) compdir="$2"; shift; shift;;
                --node) isnode=true; shift;;
+               --autosav) autosav=true; shift;;
                *) stop=true
        esac
 done
 enginebinname=$engine
 isinterpret=
 case $engine in
-       nitg)
+       nitc|nitg)
                engine=nitg-s;
-               enginebinname=nitg;
+               enginebinname=nitc;
                OPT="--separate $OPT --compile-dir $compdir"
                savdirs="sav/nitg-common/"
                ;;
-       nitg-s)
-               enginebinname=nitg;
+       nitcs|nitg-s)
+               enginebinname=nitc;
                OPT="--separate $OPT --compile-dir $compdir"
                savdirs="sav/nitg-common/"
                ;;
-       nitg-e)
-               enginebinname=nitg;
+       nitce|nitg-e)
+               enginebinname=nitc;
                OPT="--erasure $OPT --compile-dir $compdir"
                savdirs="sav/nitg-common/"
                ;;
-       nitg-sg)
-               enginebinname=nitg;
+       nitcsg|nitg-sg)
+               enginebinname=nitc;
                OPT="--semi-global $OPT --compile-dir $compdir"
                savdirs="sav/nitg-common/"
                ;;
-       nitg-g)
-               enginebinname=nitg;
+       nitcg|nitg-g)
+               enginebinname=nitc;
                OPT="--global $OPT --compile-dir $compdir"
                savdirs="sav/nitg-common/"
                ;;
@@ -418,10 +430,12 @@ case $engine in
                ;;
        nitvm)
                isinterpret=true
+               enginebinname=nit
+               OPT="--vm $OPT"
                savdirs="sav/niti/"
                ;;
        emscripten)
-               enginebinname=nitg
+               enginebinname=nitc
                OPT="-m emscripten_nodejs.nit --semi-global $OPT --compile-dir $compdir"
                savdirs="sav/nitg-sg/"
                ;;
@@ -550,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 \"\$@\""