tests: Run filter-ctrl with %fish explicitly

tests/checks/command-not-found.fish

@@ -1,4 +1,4 @@
-# RUN: %fish -C 'set -g fish %fish' %s | %filter-control-sequences
+# RUN: %fish -C 'set -g fish %fish' %s | %fish %filter-control-sequences
 set -g PATH
 $fish -c "nonexistent-command-1234 banana rama"
 #CHECKERR: fish: Unknown command: nonexistent-command-1234

tests/checks/complete_directories.fish

@@ -1,4 +1,4 @@
-#RUN: %fish --interactive %s | %filter-control-sequences
+#RUN: %fish --interactive %s | %fish %filter-control-sequences
 # ^ interactive so we can do `complete`
 mkdir -p __fish_complete_directories/
 cd __fish_complete_directories

tests/checks/git.fish

@@ -1,4 +1,4 @@
-#RUN: %fish -i %s | %filter-control-sequences
+#RUN: %fish -i %s | %fish %filter-control-sequences
 # Note: ^ this is interactive so we test interactive behavior,
 # e.g. the fish_git_prompt variable handlers test `status is-interactive`.
 #REQUIRES: command -v git

tests/checks/invocation.fish

@@ -1,4 +1,4 @@
-#RUN: %fish -C 'set -l fish %fish' %s | %filter-control-sequences
+#RUN: %fish -C 'set -l fish %fish' %s | %fish %filter-control-sequences
 
 $fish -c "echo 1.2.3.4."
 # CHECK: 1.2.3.4.

tests/checks/read.fish

@@ -1,4 +1,4 @@
-# RUN: %fish -C "set -g fish %fish; set -g filter_ctrls %filter-control-sequences" %s
+# RUN: %fish -C "set -g fish %fish; set -g filter_ctrls %fish %filter-control-sequences" %s
 # Set term again explicitly to ensure behavior.
 set -gx TERM xterm
 # Read with no vars is not an error

tests/checks/return.fish

@@ -1,4 +1,4 @@
-#RUN: %fish -C 'set -l fish %fish; set -l filter_ctrls %filter-control-sequences' %s
+#RUN: %fish -C 'set -l fish %fish; set -l filter_ctrls %fish %filter-control-sequences' %s
 # Some tests of the "return" builtin.
 
 $fish -c 'return 5'

tests/checks/set.fish

@@ -1,5 +1,5 @@
 # Explicitly overriding HOME/XDG_CONFIG_HOME is only required if not invoking via `make test`
-# RUN: env FISH=%fish %fish -C 'set -l filter_ctrls %filter-control-sequences' %s
+# RUN: env FISH=%fish %fish -C 'set -l filter_ctrls %fish %filter-control-sequences' %s
 # Environment variable tests
 
 # Test if variables can be properly set

tests/test.fish

@@ -46,7 +46,7 @@ if set -q files_to_test[1]
         --progress $force_color \
         -s fish=$FISHDIR/fish \
         -s fish_test_helper=$fish_test_helper \
-        -s filter-control-sequences="$FISHDIR/fish $scriptdir/filter-control-sequences.fish" \
+        -s filter-control-sequences="$scriptdir/filter-control-sequences.fish" \
         $files_to_test
 
     set -l littlecheck_status $status