From cb3d004a5a2b11c0e40d81ce3c39c168c2a22d48 Mon Sep 17 00:00:00 2001 From: Fabian Boehm Date: Sun, 29 Dec 2024 18:11:34 +0100 Subject: [PATCH] tests: Run filter-ctrl with %fish explicitly --- tests/checks/command-not-found.fish | 2 +- tests/checks/complete_directories.fish | 2 +- tests/checks/git.fish | 2 +- tests/checks/invocation.fish | 2 +- tests/checks/read.fish | 2 +- tests/checks/return.fish | 2 +- tests/checks/set.fish | 2 +- tests/test.fish | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/checks/command-not-found.fish b/tests/checks/command-not-found.fish index a4c26e70a..e243c0657 100644 --- a/tests/checks/command-not-found.fish +++ b/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 diff --git a/tests/checks/complete_directories.fish b/tests/checks/complete_directories.fish index e5d2f283d..aa292f447 100644 --- a/tests/checks/complete_directories.fish +++ b/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 diff --git a/tests/checks/git.fish b/tests/checks/git.fish index 0a4da467e..1fe07db4b 100644 --- a/tests/checks/git.fish +++ b/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 diff --git a/tests/checks/invocation.fish b/tests/checks/invocation.fish index 19d20562f..4e67615c9 100644 --- a/tests/checks/invocation.fish +++ b/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. diff --git a/tests/checks/read.fish b/tests/checks/read.fish index 2f6c9a454..0355f30cb 100644 --- a/tests/checks/read.fish +++ b/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 diff --git a/tests/checks/return.fish b/tests/checks/return.fish index 1c638901c..8b6232d7f 100644 --- a/tests/checks/return.fish +++ b/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' diff --git a/tests/checks/set.fish b/tests/checks/set.fish index cce47666e..a0ec8fc2c 100644 --- a/tests/checks/set.fish +++ b/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 diff --git a/tests/test.fish b/tests/test.fish index c73b1edc1..1298b1b6c 100644 --- a/tests/test.fish +++ b/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