From 5c7b7fd609c5c71609534f693a9cbdf17a23936d Mon Sep 17 00:00:00 2001
From: Fabian Homborg <FHomborg@gmail.com>
Date: Tue, 25 Jun 2019 21:12:49 +0200
Subject: [PATCH] Readd bad-switch and directory-redirection tests

Made possible by the power of regex.
---
 tests/checks/bad-option.fish                        | 2 ++
 tests/checks/directory-redirect.fish                | 5 +++++
 tests/invocation/bad-switch.err                     | 2 --
 tests/invocation/bad-switch.err.Darwin              | 2 --
 tests/invocation/bad-switch.invoke.disabled         | 1 -
 tests/invocation/directory-redirect.err             | 3 ---
 tests/invocation/directory-redirect.err.SunOS       | 3 ---
 tests/invocation/directory-redirect.invoke.disabled | 1 -
 8 files changed, 7 insertions(+), 12 deletions(-)
 create mode 100644 tests/checks/bad-option.fish
 create mode 100644 tests/checks/directory-redirect.fish
 delete mode 100644 tests/invocation/bad-switch.err
 delete mode 100644 tests/invocation/bad-switch.err.Darwin
 delete mode 100644 tests/invocation/bad-switch.invoke.disabled
 delete mode 100644 tests/invocation/directory-redirect.err
 delete mode 100644 tests/invocation/directory-redirect.err.SunOS
 delete mode 100644 tests/invocation/directory-redirect.invoke.disabled

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: <W> 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 @@
-<W> 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 @@
-<W> 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"'