From e88aa1349bd2cfdeea93d69486975348b5dc1fb4 Mon Sep 17 00:00:00 2001 From: Jeff Hostetler Date: Wed, 21 Apr 2021 09:03:24 -0400 Subject: [PATCH] t/perf: avoid copying builtin fsmonitor files into test repo Do not try to copy a fsmonitor--daemon socket from the current development directory into the test trash directory. When we run the perf suite without an explicit source repo set, we copy of the current $GIT_DIR into the test trash directory. Unix domain sockets cannot be copied in that manner, so the test setup fails. Additionally, omit any other fsmonitor--daemon temp files inside the $GIT_DIR directory. Signed-off-by: Jeff Hostetler --- t/perf/perf-lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh index 601d9f67dd..3b97e3fc0f 100644 --- a/t/perf/perf-lib.sh +++ b/t/perf/perf-lib.sh @@ -74,7 +74,7 @@ test_perf_copy_repo_contents () { for stuff in "$1"/* do case "$stuff" in - */objects|*/hooks|*/config|*/commondir|*/gitdir|*/worktrees) + */objects|*/hooks|*/config|*/commondir|*/gitdir|*/worktrees|*/fsmonitor--daemon*) ;; *) cp -R "$stuff" "$repo/.git/" || exit 1