From: "Nipunn Koorapati via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Nipunn Koorapati <nipunn1313@gmail.com>,
Nipunn Koorapati <nipunn@dropbox.com>
Subject: [PATCH 02/10] t/perf/fsmonitor: move watchman setup to one-time-repo-setup
Date: Mon, 26 Oct 2020 19:32:45 +0000 [thread overview]
Message-ID: <34d11447b46b06ae5f4fa8700885bcc8b70a3a43.1603740773.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.772.git.1603740773.gitgitgadget@gmail.com>
From: Nipunn Koorapati <nipunn@dropbox.com>
It is only required to be set up once. This prepares for
testing multiple hooks in one invocation.
Signed-off-by: Nipunn Koorapati <nipunn@dropbox.com>
---
t/perf/p7519-fsmonitor.sh | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/t/perf/p7519-fsmonitor.sh b/t/perf/p7519-fsmonitor.sh
index 23755012df..4030f569cf 100755
--- a/t/perf/p7519-fsmonitor.sh
+++ b/t/perf/p7519-fsmonitor.sh
@@ -94,7 +94,13 @@ test_expect_success "one time repo setup" '
for i in $(test_seq 1 1000); do touch 1000_files/$i; done &&
for i in $(test_seq 1 10000); do touch 10000_files/$i; done &&
git add 1_file 10_files 100_files 1000_files 10000_files &&
- git commit -m "Add files"
+ git commit -m "Add files" &&
+
+ # If Watchman exists, watch the work tree and attempt a query.
+ if test_have_prereq WATCHMAN; then
+ watchman watch "$GIT_WORK_TREE" &&
+ watchman watch-list | grep -q -F "$GIT_WORK_TREE"
+ fi
'
test_expect_success "setup for fsmonitor" '
@@ -105,17 +111,13 @@ test_expect_success "setup for fsmonitor" '
else
#
# Choose integration script based on existence of Watchman.
- # If Watchman exists, watch the work tree and attempt a query.
- # If everything succeeds, use Watchman integration script,
- # else fall back to an empty integration script.
+ # Fall back to an empty integration script.
#
mkdir .git/hooks &&
if test_have_prereq WATCHMAN
then
INTEGRATION_SCRIPT=".git/hooks/fsmonitor-watchman" &&
- cp "$TEST_DIRECTORY/../templates/hooks--fsmonitor-watchman.sample" "$INTEGRATION_SCRIPT" &&
- watchman watch "$GIT_WORK_TREE" &&
- watchman watch-list | grep -q -F "$GIT_WORK_TREE"
+ cp "$TEST_DIRECTORY/../templates/hooks--fsmonitor-watchman.sample" "$INTEGRATION_SCRIPT"
else
INTEGRATION_SCRIPT=".git/hooks/fsmonitor-empty" &&
write_script "$INTEGRATION_SCRIPT"<<-\EOF
--
gitgitgadget
next prev parent reply other threads:[~2020-10-26 19:33 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-26 19:32 [PATCH 00/10] Update fsmonitor perf suite to support integration comparisons Nipunn Koorapati via GitGitGadget
2020-10-26 19:32 ` [PATCH 01/10] t/perf/fsmonitor: separate one time repo initialization Nipunn Koorapati via GitGitGadget
2020-10-26 19:32 ` Nipunn Koorapati via GitGitGadget [this message]
2020-10-26 19:32 ` [PATCH 03/10] t/perf/fsmonitor: improve error message if typoing hook name Nipunn Koorapati via GitGitGadget
2020-10-26 21:14 ` Junio C Hamano
2020-10-26 22:02 ` Nipunn Koorapati
2020-10-26 19:32 ` [PATCH 04/10] t/perf/fsmonitor: factor description out for readability Nipunn Koorapati via GitGitGadget
2020-10-26 19:32 ` [PATCH 05/10] t/perf/fsmonitor: shorten DESC to basename Nipunn Koorapati via GitGitGadget
2020-10-26 19:32 ` [PATCH 06/10] t/perf/fsmonitor: silence initial git commit Nipunn Koorapati via GitGitGadget
2020-10-26 19:32 ` [PATCH 07/10] t/perf/fsmonitor: factor setup for fsmonitor into function Nipunn Koorapati via GitGitGadget
2020-10-26 19:32 ` [PATCH 08/10] t/perf/fsmonitor: initialize test with git reset Nipunn Koorapati via GitGitGadget
2020-10-26 19:32 ` [PATCH 09/10] t/perf/fsmonitor: perf comparison of multiple fsmonitor integrations Nipunn Koorapati via GitGitGadget
2020-10-26 19:32 ` [PATCH 10/10] t/perf/fsmonitor: add benchmark for dirty status Nipunn Koorapati via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=34d11447b46b06ae5f4fa8700885bcc8b70a3a43.1603740773.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=nipunn1313@gmail.com \
--cc=nipunn@dropbox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).