tests: put stderr before stdout

[nit.git] / tests / tests.sh

diff --git a/tests/tests.sh b/tests/tests.sh
index bde0f38..8e66db4 100755 (executable)
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -122,7 +122,7 @@ function process_result()
                else
                        echo "[fixme] out/$pattern.res $FIXME"
                fi
-               ok="$ok $pattern"
+               todos="$todos $pattern"
        elif [ -n "$SOSO" ]; then
                if [ -n "$tap" ]; then
                        echo "ok - $description # SOSO"
@@ -143,7 +143,7 @@ function process_result()
                else
                        echo "[fixme soso] out/$pattern.res $SOSOF"
                fi
-               ok="$ok $pattern"
+               todos="$todos $pattern"
        elif [ -n "$NSAV" ]; then
                if [ -n "$tap" ]; then
                        echo "not ok - $description"
@@ -173,7 +173,7 @@ function process_result()
 need_skip()
 {
        test "$noskip" = true && return 1
-       if grep "$engine" "sav/$1.skip" >/dev/null 2>&1 || echo "$1" | grep -f "$engine.skip" >/dev/null 2>&1; then
+       if echo "$1" | grep -f "$engine.skip" >/dev/null 2>&1; then
                ((tapcount=tapcount+1))
                if [ -n "$tap" ]; then
                        echo "ok - $2 # skip"
@@ -327,7 +327,6 @@ END
                        cat "$ff.compile.log" "$ff.cmp.err" > "$ff.res"
                        process_result $bf $bf
                elif [ -x "./$ff.bin" ]; then
-                       cp "$ff.cmp.err" "$ff.res"
                        test -z "$tap" && echo -n ". "
                        # Execute
                        args=""
@@ -335,7 +334,7 @@ END
                                echo ""
                                echo "NIT_NO_STACK=1 ./$ff.bin" $args
                        fi
-                       NIT_NO_STACK=1 "./$ff.bin" $args < "$inputs" >> "$ff.res" 2>"$ff.err"
+                       NIT_NO_STACK=1 "./$ff.bin" $args < "$inputs" > "$ff.res" 2>"$ff.err"
                        if [ "x$verbose" = "xtrue" ]; then
                                cat "$ff.res"
                                cat >&2 "$ff.err"
@@ -345,9 +344,8 @@ END
                        elif [ -d "$ff.write" ]; then
                                LANG=C /bin/ls -F $ff.write >> "$ff.res"
                        fi
-                       if [ -s "$ff.err" ]; then
-                               cat "$ff.err" >> "$ff.res"
-                       fi
+                       cp "$ff.res"  "$ff.res2"
+                       cat "$ff.cmp.err" "$ff.err" "$ff.res2" > "$ff.res"
                        process_result $bf $bf
 
                        if [ -f "$f.args" ]; then
@@ -379,7 +377,8 @@ END
                                                LANG=C /bin/ls -F $fff.write >> "$fff.res"
                                        fi
                                        if [ -s "$fff.err" ]; then
-                                               cat "$fff.err" >> "$fff.res"
+                                               cp "$fff.res"  "$fff.res2"
+                                               cat "$fff.err" "$fff.res2" > "$fff.res"
                                        fi
                                        process_result $bff "  args #$cptr"
                                done < $fargs
@@ -398,7 +397,7 @@ if [ -n "$tap" ]; then
        echo "# ok:" `echo $ok | wc -w`
        echo "# not ok:" `echo $nok | wc -w`
        echo "# no sav:" `echo $nos | wc -w`
-       echo "# todos:" `echo $todos | wc -w`
+       echo "# todo/fixme:" `echo $todos | wc -w`
        exit
 fi
 
@@ -412,7 +411,7 @@ if [ -n "$nos" ]; then
        echo "no sav: $nos"
 fi
 if [ -n "$todos" ]; then
-       echo "todos: $todos"
+       echo "todo/fixme: $todos"
 fi
 
 # write $ERRLIST