diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-02-05 16:31:22 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-05 16:31:22 -0800 |
| commit | e93f5c6878107eb2c468bdf00d53b19a6e8eae2f (patch) | |
| tree | 0529ec30b3a97387c6c6d4a6c8e934d5bc556153 /t | |
| parent | Merge branch 'rs/rebase-commit-validation' into maint (diff) | |
| parent | p7519: allow running without watchman prereq (diff) | |
| download | tgif-e93f5c6878107eb2c468bdf00d53b19a6e8eae2f.tar.xz | |
Merge branch 'nk/perf-fsmonitor-cleanup' into maint
Test fix.
* nk/perf-fsmonitor-cleanup:
p7519: allow running without watchman prereq
Diffstat (limited to 't')
| -rwxr-xr-x | t/perf/p7519-fsmonitor.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/t/perf/p7519-fsmonitor.sh b/t/perf/p7519-fsmonitor.sh index 9b43342806..1e20a184c7 100755 --- a/t/perf/p7519-fsmonitor.sh +++ b/t/perf/p7519-fsmonitor.sh @@ -129,7 +129,12 @@ setup_for_fsmonitor() { git config core.fsmonitor "$INTEGRATION_SCRIPT" && git update-index --fsmonitor 2>error && - test_must_be_empty error # ensure no silent error + if test_have_prereq WATCHMAN + then + test_must_be_empty error # ensure no silent error + else + grep "Empty last update token" error + fi } test_perf_w_drop_caches () { |