@@ -22,7 +22,9 @@ test_description="Test core.fsmonitor"
22
22
#
23
23
# GIT_PERF_7519_UNTRACKED_CACHE: used to configure core.untrackedCache
24
24
# GIT_PERF_7519_SPLIT_INDEX: used to configure core.splitIndex
25
- # GIT_PERF_7519_FSMONITOR: used to configure core.fsMonitor
25
+ # GIT_PERF_7519_FSMONITOR: used to configure core.fsMonitor. May be an
26
+ # absolute path to an integration. May be a space delimited list of
27
+ # absolute paths to integrations.
26
28
#
27
29
# The big win for using fsmonitor is the elimination of the need to scan the
28
30
# working directory looking for changed and untracked files. If the file
@@ -105,9 +107,9 @@ test_expect_success "one time repo setup" '
105
107
106
108
setup_for_fsmonitor () {
107
109
# set INTEGRATION_SCRIPT depending on the environment
108
- if test -n " $GIT_PERF_7519_FSMONITOR "
110
+ if test -n " $INTEGRATION_PATH "
109
111
then
110
- INTEGRATION_SCRIPT=" $GIT_PERF_7519_FSMONITOR "
112
+ INTEGRATION_SCRIPT=" $INTEGRATION_PATH "
111
113
else
112
114
#
113
115
# Choose integration script based on existence of Watchman.
@@ -192,11 +194,15 @@ test_fsmonitor_suite() {
192
194
'
193
195
}
194
196
195
- test_expect_success " setup for fsmonitor" '
196
- setup_for_fsmonitor
197
- '
198
-
199
- test_fsmonitor_suite
197
+ if test -n " $GIT_PERF_7519_FSMONITOR " ; then
198
+ for INTEGRATION_PATH in $GIT_PERF_7519_FSMONITOR ; do
199
+ test_expect_success " setup for fsmonitor $INTEGRATION_PATH " ' setup_for_fsmonitor'
200
+ test_fsmonitor_suite
201
+ done
202
+ else
203
+ test_expect_success " setup for fsmonitor" ' setup_for_fsmonitor'
204
+ test_fsmonitor_suite
205
+ fi
200
206
201
207
test_expect_success " setup without fsmonitor" '
202
208
unset INTEGRATION_SCRIPT &&
0 commit comments