diff --git a/tests/checks/bad-option.fish b/tests/checks/bad-option.fish new file mode 100644 index 000000000..f3c0af42e --- /dev/null +++ b/tests/checks/bad-option.fish @@ -0,0 +1,2 @@ +#RUN: %fish -Z +#CHECKERR: {{.*fish}}: {{unrecognized option: Z|invalid option -- '?Z'?}} diff --git a/tests/checks/directory-redirect.fish b/tests/checks/directory-redirect.fish new file mode 100644 index 000000000..544661cd8 --- /dev/null +++ b/tests/checks/directory-redirect.fish @@ -0,0 +1,5 @@ +#RUN: %fish -c 'begin; end > . ; status -b; and echo "status -b returned true after bad redirect on a begin block"; echo $status' +# Note that we sometimes get fancy quotation marks here, so let's match three characters +#CHECKERR: fish: An error occurred while redirecting file {{...}} +#CHECKERR: {{open: Is a directory|open: Invalid argument}} +#CHECK: 1 diff --git a/tests/invocation/bad-switch.err b/tests/invocation/bad-switch.err deleted file mode 100644 index 93124dfa5..000000000 --- a/tests/invocation/bad-switch.err +++ /dev/null @@ -1,2 +0,0 @@ -./fish: invalid option -- 'Z' -RC: 1 diff --git a/tests/invocation/bad-switch.err.Darwin b/tests/invocation/bad-switch.err.Darwin deleted file mode 100644 index 2d2f2fa68..000000000 --- a/tests/invocation/bad-switch.err.Darwin +++ /dev/null @@ -1,2 +0,0 @@ -fish: invalid option -- Z -RC: 1 diff --git a/tests/invocation/bad-switch.invoke.disabled b/tests/invocation/bad-switch.invoke.disabled deleted file mode 100644 index 2e52e40e7..000000000 --- a/tests/invocation/bad-switch.invoke.disabled +++ /dev/null @@ -1 +0,0 @@ --Z diff --git a/tests/invocation/directory-redirect.err b/tests/invocation/directory-redirect.err deleted file mode 100644 index ed2330550..000000000 --- a/tests/invocation/directory-redirect.err +++ /dev/null @@ -1,3 +0,0 @@ - fish: An error occurred while redirecting file '.' -open: Is a directory -RC: 1 diff --git a/tests/invocation/directory-redirect.err.SunOS b/tests/invocation/directory-redirect.err.SunOS deleted file mode 100644 index e3e6b2534..000000000 --- a/tests/invocation/directory-redirect.err.SunOS +++ /dev/null @@ -1,3 +0,0 @@ - fish: An error occurred while redirecting file '.' -open: Invalid argument -RC: 1 diff --git a/tests/invocation/directory-redirect.invoke.disabled b/tests/invocation/directory-redirect.invoke.disabled deleted file mode 100644 index 84a002bea..000000000 --- a/tests/invocation/directory-redirect.invoke.disabled +++ /dev/null @@ -1 +0,0 @@ --c 'begin; end > . ; status -b; and echo "status -b returned true after bad redirect on a begin block"'