diff options
| author |  René Scharfe <l.s.r@web.de> | 2017-12-16 13:12:23 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-12-18 14:00:45 -0800 |
| commit | b4f61b7fa455b6bea2a12d46c59d8685f761018b (patch) | |
| tree | 88d0fc6c6a352669808c4b75b4656c0f8d4f5d89 | |
| parent | fsmonitor: preserve utf8 filenames in fsmonitor-watchman log (diff) | |
| download | tgif-b4f61b7fa455b6bea2a12d46c59d8685f761018b.tar.xz | |
p7519: improve check for prerequisite WATCHMAN
The return code of command -v with a non-existing command is 1 in bash
and 127 in dash. Use that return code directly to allow the script to
work with dash and without watchman (e.g. on Debian).
While at it stop redirecting the output. stderr is redirected to
/dev/null by test_lazy_prereq already, and stdout can actually be
useful -- the path of the found watchman executable is sent there, but
it's shown only if the script was run with --verbose.
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Acked-by: Ben Peart <benpeart@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/perf/p7519-fsmonitor.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/t/perf/p7519-fsmonitor.sh b/t/perf/p7519-fsmonitor.sh index 16d1bf72e5..65e145c02d 100755 --- a/t/perf/p7519-fsmonitor.sh +++ b/t/perf/p7519-fsmonitor.sh @@ -40,8 +40,7 @@ test_lazy_prereq UNTRACKED_CACHE ' ' test_lazy_prereq WATCHMAN ' - { command -v watchman >/dev/null 2>&1; ret=$?; } && - test $ret -ne 1 + command -v watchman ' if test_have_prereq WATCHMAN |