Makefile: `all` generate manpages as `pandoc` is no more required

[nit.git] / tests / tests.sh

diff --git a/tests/tests.sh b/tests/tests.sh
index 3bf20dc..99e3008 100755 (executable)
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -260,7 +260,7 @@ function process_result()
                esac
        done
        OLD=`echo "$OLD" | sed -e 's/   */ /g' -e 's/^ //' -e 's/ $//'`
-       grep 'NOT YET IMPLEMENTED' "$outdir/$pattern.res" >/dev/null
+       istodo  "$outdir/$pattern.res"
        NYI="$?"
        if [ -n "$SAV" ]; then
                if [ -n "$OLD" ]; then
@@ -382,6 +382,7 @@ skip_exec()
        test "$noskip" = true && return 1
        for savdir in $savdirs .; do
                local f="$savdir/exec.skip"
+               test -f "$f" || continue
                if echo "$1" | grep -f "$f" >/dev/null 2>&1; then
                        echo -n "_ no exec by $f; "
                        return 0
@@ -395,6 +396,7 @@ skip_cc()
        test "$noskip" = true && return 1
        for savdir in $savdirs .; do
                local f="$savdir/cc.skip"
+               test -f "$f" || continue
                if echo "$1" | grep -f "$f" >/dev/null 2>&1; then
                        return 0
                fi
@@ -402,6 +404,20 @@ skip_cc()
        return 1
 }
 
+# Check that the resfile ($1) matches some magic strings in `todo` files.
+istodo()
+{
+       test "$no" = true && return 1
+       for savdir in $savdirs .; do
+               local f="$savdir/todo"
+               test -f "$f" || continue
+               if grep -f "$f" "$1" >/dev/null 2>&1; then
+                       return 0
+               fi
+       done
+       return 1
+}
+
 find_nitc()
 {
        local name="$enginebinname"
@@ -484,6 +500,12 @@ case $engine in
                OPT="--vm $OPT"
                savdirs="sav/niti/"
                ;;
+       nitj)
+               engine=nitj;
+               OPT="--compile-dir $compdir --ant"
+               enginebinname=nitj;
+               savdirs="sav/nitc-common/"
+               ;;
        emscripten)
                enginebinname=nitc
                OPT="-m emscripten_nodejs.nit --semi-global $OPT --compile-dir $compdir"
@@ -556,7 +578,7 @@ for ii in "$@"; do
 
        tmp=${ii/../AA}
        if [ "x$tmp" = "x$ii" ]; then
-               includes="-I . -I ../lib/standard -I ../lib/standard/collection -I alt"
+               includes="-I . -I ../lib/core -I ../lib/core/collection -I alt"
        else
                includes="-I alt"
        fi