Rejigger test suite

Split test_interactive off from test_fishscript and add a new target
test_high_level that tests both.

Add some Makefile magic so the tests can be run serially without using
sub-make, which gets rid of a little noise from the make output.

Rewrite interactive tests to look better.

1 files changed, 0 insertions, 28 deletions

diff --git a/tests/test.fish b/tests/test.fish
index 9a91bb27..a74165b9 100755
--- a/tests/test.fish
+++ b/tests/test.fish
@@ -37,34 +37,6 @@ if [ "$argv" != '-n' ]
         echo "Profiling failed"
     end
 
-    echo "Testing interactive functionality"
-    # bug: `fish -n` throws errors on fishscript functions that don't shadow real commands,
-    # so we can't use `type -q expect` here.
-    if command -s expect >/dev/null
-        # we have expect, we can run the interactive tests
-        begin
-            ../fish -n ./interactive.fish ^interactive.tmp.err
-            ../fish ./interactive.fish ^^interactive.tmp.err
-        end  | tee interactive.tmp.out
-        set -l tmp_status $status
-        if not diff interactive.tmp.out interactive.out >/dev/null
-            set res fail
-            echo "Output differs for file interactive.fish"
-        end
-
-        if not diff interactive.tmp.err interactive.err >/dev/null
-            set res fail
-            echo "Error output differs for file interactive.fish"
-        end
-
-        if test $tmp_status -ne (cat interactive.status)
-            set res fail
-            echo "Exit status differs for file interactive.fish"
-        end
-    else
-        echo "Tests disabled: `expect` not found"
-    end
-
     if test $res = ok
         echo "File test.fish tested ok"
         exit 0