Skip to content

Commit 08894d3

Browse files
jeffhostetlergitster
authored andcommitted
t/perf: avoid copying builtin fsmonitor files into test repo
Do not copy any of the various fsmonitor--daemon files from the .git directory of the (GIT_PREF_REPO or GIT_PERF_LARGE_REPO) source repo into the test's trash directory. When perf tests start, they copy the contents of the source repo into the test's trash directory. If fsmonitor is running in the source repo, there may be control files, such as the IPC socket and/or fsmonitor cookie files. These should not be copied into the test repo. Unix domain sockets cannot be copied in the manner used by the test setup, so if present, the test setup fails. Cookie files are harmless, but we should avoid them. The builtin fsmonitor keeps all such control files/sockets in .git/fsmonitor--daemon*, so it is simple to exclude them. Signed-off-by: Jeff Hostetler <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent a00cdff commit 08894d3

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

t/perf/perf-lib.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ test_perf_copy_repo_contents () {
7878
for stuff in "$1"/*
7979
do
8080
case "$stuff" in
81-
*/objects|*/hooks|*/config|*/commondir|*/gitdir|*/worktrees)
81+
*/objects|*/hooks|*/config|*/commondir|*/gitdir|*/worktrees|*/fsmonitor--daemon*)
8282
;;
8383
*)
8484
cp -R "$stuff" "$repo/.git/" || exit 1

0 commit comments

Comments
 (0)