diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-01-15 15:20:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-01-15 15:20:29 -0800 |
| commit | 7bfa0229936e88254de15e967ac09dbac50d7899 (patch) | |
| tree | 4c7d191ea7d03a7da080f6df5ccb9d5f0918a7b3 | |
| parent | Merge branch 'ds/trace2-topo-walk' (diff) | |
| parent | p7519: allow running without watchman prereq (diff) | |
| download | git-7bfa0229936e88254de15e967ac09dbac50d7899.tar.gz git-7bfa0229936e88254de15e967ac09dbac50d7899.zip | |
Merge branch 'nk/perf-fsmonitor-cleanup'
Test fix.
* nk/perf-fsmonitor-cleanup:
p7519: allow running without watchman prereq
| -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 () { |