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>
René Scharfe committed
Dec 16, 2017 at 13:12 UTC
b4f61b7fa455b6bea2a12d46c59d8685f761018b
1 file changed
+1
-2
t/perf/p7519-fsmonitor.sh
+1
-2
@@ -40,8 +40,7 @@ test_lazy_prereq UNTRACKED_CACHE '
40
'
41
42
test_lazy_prereq WATCHMAN '
43
- { command -v watchman >/dev/null 2>&1; ret=$?; } &&
44
- test $ret -ne 1
43
+ command -v watchman
44
'
45
46
if test_have_prereq WATCHMAN