mirror of
https://github.com/fish-shell/fish-shell
synced 2024-12-26 04:43:10 +00:00
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
This commit is contained in:
Kurtis Rader
parent
bd33e11599
commit
2f0cb2a32b
31 changed files with 10 additions and 40 deletions
|
|
@ -1 +0,0 @@
|
||||||
0
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
0
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
0
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
0
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
0
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
0
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
0
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
0
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
0
|
|
||||||
|
|
@ -33,7 +33,7 @@ function test_file
|
||||||
set -lx TERM dumb
|
set -lx TERM dumb
|
||||||
expect -n -c 'source interactive.expect.rc' -f $file >$file.tmp.out ^$file.tmp.err
|
expect -n -c 'source interactive.expect.rc' -f $file >$file.tmp.out ^$file.tmp.err
|
||||||
end
|
end
|
||||||
set -l tmp_status $status
|
set -l exit_status $status
|
||||||
set -l res ok
|
set -l res ok
|
||||||
mv -f interactive.tmp.log $file.tmp.log
|
mv -f interactive.tmp.log $file.tmp.log
|
||||||
|
|
||||||
|
|
@ -41,9 +41,8 @@ function test_file
|
||||||
set -l out_status $status
|
set -l out_status $status
|
||||||
diff $file.tmp.err $file.err >/dev/null
|
diff $file.tmp.err $file.err >/dev/null
|
||||||
set -l err_status $status
|
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"
|
say green "ok"
|
||||||
# clean up tmp files
|
# clean up tmp files
|
||||||
rm -f $file.tmp.{err,out,log}
|
rm -f $file.tmp.{err,out,log}
|
||||||
|
|
@ -58,9 +57,9 @@ function test_file
|
||||||
say yellow "Error output differs for file $file. Diff follows:"
|
say yellow "Error output differs for file $file. Diff follows:"
|
||||||
colordiff -u $file.tmp.err $file.err
|
colordiff -u $file.tmp.err $file.err
|
||||||
end
|
end
|
||||||
if test $exp_status -ne $tmp_status
|
if test $exit_status -ne 0
|
||||||
say yellow "Exit status differs for file $file."
|
say yellow "Exit status differs for file $file."
|
||||||
echo "Expected $exp_status, got $tmp_status."
|
echo "Unexpected test exit status $exit_status."
|
||||||
end
|
end
|
||||||
if set -q SHOW_INTERACTIVE_LOG
|
if set -q SHOW_INTERACTIVE_LOG
|
||||||
# dump the interactive log
|
# dump the interactive log
|
||||||
|
|
|
||||||
|
|
@ -2,4 +2,5 @@ sleep 1 &
|
||||||
sleep 1 &
|
sleep 1 &
|
||||||
jobs -c
|
jobs -c
|
||||||
bg 3
|
bg 3
|
||||||
fg 3
|
fg 3
|
||||||
|
or exit 0
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
1
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
0
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
0
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
0
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
0
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
0
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
0
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
0
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
0
|
|
||||||
|
|
@ -25,16 +25,15 @@ function test_file
|
||||||
echo -n "Testing file $file ... "
|
echo -n "Testing file $file ... "
|
||||||
|
|
||||||
../test/root/bin/fish <$file >$base.tmp.out ^$base.tmp.err
|
../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
|
set -l res ok
|
||||||
|
|
||||||
diff $base.tmp.out $base.out >/dev/null
|
diff $base.tmp.out $base.out >/dev/null
|
||||||
set -l out_status $status
|
set -l out_status $status
|
||||||
diff $base.tmp.err $base.err >/dev/null
|
diff $base.tmp.err $base.err >/dev/null
|
||||||
set -l err_status $status
|
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"
|
say green "ok"
|
||||||
# clean up tmp files
|
# clean up tmp files
|
||||||
rm -f $base.tmp.{err,out}
|
rm -f $base.tmp.{err,out}
|
||||||
|
|
@ -49,9 +48,9 @@ function test_file
|
||||||
say yellow "Error output differs for file $file. Diff follows:"
|
say yellow "Error output differs for file $file. Diff follows:"
|
||||||
colordiff -u $base.tmp.err $base.err
|
colordiff -u $base.tmp.err $base.err
|
||||||
end
|
end
|
||||||
if test $exp_status -ne $tmp_status
|
if test $exit_status -ne 0
|
||||||
say yellow "Exit status differs for file $file."
|
say yellow "Exit status differs for file $file."
|
||||||
echo "Expected $exp_status, got $tmp_status."
|
echo "Unexpected test exit status $exit_status."
|
||||||
end
|
end
|
||||||
return 1
|
return 1
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
0
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
0
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
0
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
0
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
0
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
0
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
0
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
0
|
|
||||||
|
|
@ -145,5 +145,3 @@ end
|
||||||
# Comments abutting text (#953)
|
# Comments abutting text (#953)
|
||||||
echo not#a#comment
|
echo not#a#comment
|
||||||
echo is # a # comment
|
echo is # a # comment
|
||||||
|
|
||||||
false
|
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
1
|
|
||||||
Loading…
Reference in a new issue