remove the tests/*.status files

The tests/*.status files aren't useful so eliminate them. Just verify whether a given test module exited with a success status. There isn't any point in having a "status" file that indicates the test module should exit with a success (zero) status. Closes #3208 Closes #3209
2024-12-26 04:43:10 +00:00 · 2016-07-05 23:12:28 -07:00 · 2016-07-05 23:12:28 -07:00 · 2f0cb2a32b
commit 2f0cb2a32b
parent bd33e11599
31 changed files with 10 additions and 40 deletions
--- a/tests/abbr.status
+++ b/tests/abbr.status
@ -1 +0,0 @@
-0
--- a/tests/bind.expect.status
+++ b/tests/bind.expect.status
@ -1 +0,0 @@
-0
--- a/tests/commandline.expect.status
+++ b/tests/commandline.expect.status
@ -1 +0,0 @@
-0
--- a/tests/expansion.status
+++ b/tests/expansion.status
@ -1 +0,0 @@
-0
--- a/tests/fish_realpath.status
+++ b/tests/fish_realpath.status
@ -1 +0,0 @@
-0
--- a/tests/fkr.expect.status
+++ b/tests/fkr.expect.status
@ -1 +0,0 @@
-0
--- a/tests/function.status
+++ b/tests/function.status
@ -1 +0,0 @@
-0
--- a/tests/generic.expect.status
+++ b/tests/generic.expect.status
@ -1 +0,0 @@
-0
--- a/tests/indent.status
+++ b/tests/indent.status
@ -1 +0,0 @@
-0
--- a/tests/interactive.fish
+++ b/tests/interactive.fish
@ -33,7 +33,7 @@ function test_file
        set -lx TERM dumb
        expect -n -c 'source interactive.expect.rc' -f $file >$file.tmp.out ^$file.tmp.err
    end
-    set -l tmp_status $status
+    set -l exit_status $status
    set -l res ok
    mv -f interactive.tmp.log $file.tmp.log

@ -41,9 +41,8 @@ function test_file
    set -l out_status $status
    diff $file.tmp.err $file.err >/dev/null
    set -l err_status $status
-    set -l exp_status (cat $file.status)[1]

-    if test $out_status -eq 0 -a $err_status -eq 0 -a $exp_status -eq $tmp_status
+    if test $out_status -eq 0 -a $err_status -eq 0 -a $exit_status -eq 0
        say green "ok"
        # clean up tmp files
        rm -f $file.tmp.{err,out,log}
@ -58,9 +57,9 @@ function test_file
            say yellow "Error output differs for file $file. Diff follows:"
            colordiff -u $file.tmp.err $file.err
        end
-        if test $exp_status -ne $tmp_status
+        if test $exit_status -ne 0
            say yellow "Exit status differs for file $file."
-            echo "Expected $exp_status, got $tmp_status."
+            echo "Unexpected test exit status $exit_status."
        end
        if set -q SHOW_INTERACTIVE_LOG
            # dump the interactive log
--- a/tests/jobs.in
+++ b/tests/jobs.in
@ -2,4 +2,5 @@ sleep 1 &
 sleep 1 &
 jobs -c
 bg 3
-fg 3
+fg 3
+or exit 0
--- a/tests/jobs.status
+++ b/tests/jobs.status
@ -1 +0,0 @@
-1
--- a/tests/line-continuation.status
+++ b/tests/line-continuation.status
@ -1 +0,0 @@
-0
--- a/tests/locale.status
+++ b/tests/locale.status
@ -1 +0,0 @@
-0
--- a/tests/math.status
+++ b/tests/math.status
@ -1 +0,0 @@
-0
--- a/tests/printf.status
+++ b/tests/printf.status
@ -1 +0,0 @@
-0
--- a/tests/read.expect.status
+++ b/tests/read.expect.status
@ -1 +0,0 @@
-0
--- a/tests/read.status
+++ b/tests/read.status
@ -1 +0,0 @@
-0
--- a/tests/status.status
+++ b/tests/status.status
@ -1 +0,0 @@
-0
--- a/tests/string.status
+++ b/tests/string.status
@ -1 +0,0 @@
-0
--- a/tests/test.fish
+++ b/tests/test.fish
@ -25,16 +25,15 @@ function test_file
    echo -n "Testing file $file ... "

    ../test/root/bin/fish <$file >$base.tmp.out ^$base.tmp.err
-    set -l tmp_status $status
+    set -l exit_status $status
    set -l res ok

    diff $base.tmp.out $base.out >/dev/null
    set -l out_status $status
    diff $base.tmp.err $base.err >/dev/null
    set -l err_status $status
-    set -l exp_status (cat $base.status)[1]

-    if test $out_status -eq 0 -a $err_status -eq 0 -a $exp_status -eq $tmp_status
+    if test $out_status -eq 0 -a $err_status -eq 0 -a $exit_status -eq 0
        say green "ok"
        # clean up tmp files
        rm -f $base.tmp.{err,out}
@ -49,9 +48,9 @@ function test_file
            say yellow "Error output differs for file $file. Diff follows:"
            colordiff -u $base.tmp.err $base.err
        end
-        if test $exp_status -ne $tmp_status
+        if test $exit_status -ne 0
            say yellow "Exit status differs for file $file."
-            echo "Expected $exp_status, got $tmp_status."
+            echo "Unexpected test exit status $exit_status."
        end
        return 1
    end
--- a/tests/test1.status
+++ b/tests/test1.status
@ -1 +0,0 @@
-0
--- a/tests/test2.status
+++ b/tests/test2.status
@ -1 +0,0 @@
-0
--- a/tests/test3.status
+++ b/tests/test3.status
@ -1 +0,0 @@
-0
--- a/tests/test4.status
+++ b/tests/test4.status
@ -1 +0,0 @@
-0
--- a/tests/test5.status
+++ b/tests/test5.status
@ -1 +0,0 @@
-0
--- a/tests/test6.status
+++ b/tests/test6.status
@ -1 +0,0 @@
-0
--- a/tests/test7.status
+++ b/tests/test7.status
@ -1 +0,0 @@
-0
--- a/tests/test8.status
+++ b/tests/test8.status
@ -1 +0,0 @@
-0
--- a/tests/test9.in
+++ b/tests/test9.in
@ -145,5 +145,3 @@ end
 # Comments abutting text (#953)
 echo not#a#comment
 echo is # a # comment
-
-false
--- a/tests/test9.status
+++ b/tests/test9.status
@ -1 +0,0 @@
-1