diff options
author | Taylor Blau <me@ttaylorr.com> | 2021-01-04 16:35:37 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-01-06 13:48:25 -0800 |
commit | cc2d43be2bc93f7016ee97b8d78a79d771e017e4 (patch) | |
tree | 21dbe941680c8bf608d18a06c75bb851178dc290 /ci/config | |
parent | perf/fsmonitor: use test_must_be_empty helper (diff) | |
download | tgif-cc2d43be2bc93f7016ee97b8d78a79d771e017e4.tar.xz |
p7519: allow running without watchman prereq
p7519 measures the performance of the fsmonitor code. To do this, it
uses the installed copy of Watchman. If Watchman isn't installed, a noop
integration script is installed in its place.
When in the latter mode, it is expected that the script should not write
a "last update token": in fact, it doesn't write anything at all since
the script is blank.
Commit 33226af42b (t/perf/fsmonitor: improve error message if typoing
hook name, 2020-10-26) made sure that running 'git update-index
--fsmonitor' did not write anything to stderr, but this is not the case
when using the empty Watchman script, since Git will complain that:
$ which watchman
watchman not found
$ cat .git/hooks/fsmonitor-empty
$ git -c core.fsmonitor=.git/hooks/fsmonitor-empty update-index --fsmonitor
warning: Empty last update token.
Prior to 33226af42b, the output wasn't checked at all, which allowed
this noop mode to work. But, 33226af42b breaks p7519 when running it
without a 'watchman(1)' on your system.
Handle this by only checking that the stderr is empty only when running
with a real watchman executable. Otherwise, assert that the error
message is the expected one when running in the noop mode.
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Acked-by: Nipunn Koorapati <nipunn@dropbox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'ci/config')
0 files changed, 0 insertions, 0 deletions