kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

p7519: move watchman cleanup earlier in the test 

Shutdown Watchman after the Watchman-based tests and before the block of
"no fsmonitor" tests.

This helps ensure that Watchman cannot affect the test results for the
other.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Reviewed-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff Hostetler 2021-02-03 15:34:42 +00:00 committed by Junio C Hamano
parent 0917763d67
commit a7556c3bde
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
t/perf/p7519-fsmonitor.sh
View File

@ -208,6 +208,11 @@ test_fsmonitor_suite() {
' '
} }


#
# Run a full set of perf tests using each Hook-based fsmonitor provider,
# such as Watchman.
#

if test -n "$GIT_PERF_7519_FSMONITOR"; then if test -n "$GIT_PERF_7519_FSMONITOR"; then
for INTEGRATION_PATH in $GIT_PERF_7519_FSMONITOR; do for INTEGRATION_PATH in $GIT_PERF_7519_FSMONITOR; do
test_expect_success "setup for fsmonitor $INTEGRATION_PATH" 'setup_for_fsmonitor' test_expect_success "setup for fsmonitor $INTEGRATION_PATH" 'setup_for_fsmonitor'
@ -218,14 +223,6 @@ else
test_fsmonitor_suite test_fsmonitor_suite
fi fi


test_expect_success "setup without fsmonitor" '
unset INTEGRATION_SCRIPT &&
git config --unset core.fsmonitor &&
git update-index --no-fsmonitor
'

test_fsmonitor_suite

if test_have_prereq WATCHMAN if test_have_prereq WATCHMAN
then then
watchman watch-del "$GIT_WORK_TREE" >/dev/null 2>&1 && watchman watch-del "$GIT_WORK_TREE" >/dev/null 2>&1 &&
@ -235,4 +232,16 @@ then
watchman shutdown-server >/dev/null 2>&1 watchman shutdown-server >/dev/null 2>&1
fi fi


#
# Run a full set of perf tests with the fsmonitor feature disabled.
#

test_expect_success "setup without fsmonitor" '
unset INTEGRATION_SCRIPT &&
git config --unset core.fsmonitor &&
git update-index --no-fsmonitor
'

test_fsmonitor_suite

test_done test_done