From f6bba5ceb4e0e6bd1d0f45e0fe414d62fb9636dc Mon Sep 17 00:00:00 2001 From: Fabian Homborg Date: Tue, 6 Oct 2020 17:40:22 +0200 Subject: [PATCH] tests: Pass $fish as a variable in some cases I am not sure why this worked, actually. These tests did not have $fish set anywhere, and on my fresh OpenBSD VM it ended up calling whatever that calls "fish" (I think it's that "Go fish!" game?). --- tests/checks/job-control-noninteractive.fish | 2 +- tests/checks/pipeline-pgroup.fish | 2 +- tests/checks/sigint.fish | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/checks/job-control-noninteractive.fish b/tests/checks/job-control-noninteractive.fish index dc166335d..6c9566456 100644 --- a/tests/checks/job-control-noninteractive.fish +++ b/tests/checks/job-control-noninteractive.fish @@ -1,4 +1,4 @@ -#RUN: env fth=%fish_test_helper %fish %s +#RUN: env fth=%fish_test_helper fish=%fish %fish %s # Ensure job control works in non-interactive environments. diff --git a/tests/checks/pipeline-pgroup.fish b/tests/checks/pipeline-pgroup.fish index 24eb78e9d..07da18829 100644 --- a/tests/checks/pipeline-pgroup.fish +++ b/tests/checks/pipeline-pgroup.fish @@ -1,4 +1,4 @@ -# RUN: env fth=%fish_test_helper %fish %s +# RUN: env fth=%fish_test_helper fish=%fish %fish %s status job-control full diff --git a/tests/checks/sigint.fish b/tests/checks/sigint.fish index 483cccf92..88ffc3247 100644 --- a/tests/checks/sigint.fish +++ b/tests/checks/sigint.fish @@ -1,4 +1,4 @@ -#RUN: %fish -C "set helper %fish_test_helper" %s +#RUN: %fish -C "set -g helper %fish_test_helper; set -g fish %fish" %s # Check that nohup is propagated. set fish (status fish-path)