From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Derrick Stolee" <derrickstolee@github.com>,
"Elijah Newren" <newren@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 3/4] test-tools: migrate read-cache-again to parse_options()
Date: Mon, 7 Jun 2021 13:58:26 +0200 [thread overview]
Message-ID: <patch-3.4-36f4072b13-20210607T115454Z-avarab@gmail.com> (raw)
In-Reply-To: <cover-0.4-0000000000-20210607T115454Z-avarab@gmail.com>
Change the newly added (but then mostly copy/pasted) read-cache-perf
to use the parse_options() API. I have no plans to further modify
read-cache-again, but making these commands consistent has a value in
and of itself.
Since we check the "cnt = < 1" case now via more idiomatic
post-parse_options() assertions we can move from the for-loop to a
while-loop and ditch the "i" variable.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
t/helper/test-read-cache-again.c | 28 ++++++++++++++++++++++------
t/t7519-status-fsmonitor.sh | 2 +-
2 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/t/helper/test-read-cache-again.c b/t/helper/test-read-cache-again.c
index 707db036cb..8487f79d04 100644
--- a/t/helper/test-read-cache-again.c
+++ b/t/helper/test-read-cache-again.c
@@ -1,20 +1,36 @@
#include "test-tool.h"
#include "cache.h"
+#include "parse-options.h"
+
+static const char *read_cache_again_usage[] = {
+ "test-tool read-cache-again [<options>...] <file>",
+ NULL
+};
int cmd__read_cache_again(int argc, const char **argv)
{
struct repository *r = the_repository;
- int i, cnt;
+ int cnt = -1;
const char *name;
+ struct option options[] = {
+ OPT_INTEGER(0, "count", &cnt, "number of passes"),
+ OPT_END()
+ };
- if (argc != 2)
- die("usage: test-tool read-cache-again <count> <file>");
-
- cnt = strtol(argv[0], NULL, 0);
+ argc = parse_options(argc, argv, "test-tools", options,
+ read_cache_again_usage, 0);
+ if (argc != 1)
+ usage_msg_opt("Too many arguments.", read_cache_again_usage,
+ options);
+ if (cnt == -1)
+ cnt = 2;
+ else if (cnt < 1)
+ usage_msg_opt("Need at least one pass.", read_cache_again_usage,
+ options);
name = argv[2];
setup_git_directory();
- for (i = 0; i < cnt; i++) {
+ while (cnt--) {
int pos;
repo_read_index(r);
refresh_index(r->index, REFRESH_QUIET,
diff --git a/t/t7519-status-fsmonitor.sh b/t/t7519-status-fsmonitor.sh
index 4c199c16d4..fd0815f6b7 100755
--- a/t/t7519-status-fsmonitor.sh
+++ b/t/t7519-status-fsmonitor.sh
@@ -359,7 +359,7 @@ test_expect_success UNTRACKED_CACHE 'ignore .git changes when invalidating UNTR'
test_expect_success 'discard_index() also discards fsmonitor info' '
test_config core.fsmonitor "$TEST_DIRECTORY/t7519/fsmonitor-all" &&
test_might_fail git update-index --refresh &&
- test-tool read-cache-again 2 tracked >actual &&
+ test-tool read-cache-again --count=2 tracked >actual &&
printf "tracked is%s up to date\n" "" " not" >expect &&
test_cmp expect actual
'
--
2.32.0.rc3.434.gd8aed1f08a7
next prev parent reply other threads:[~2021-06-07 11:59 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-07 11:58 [PATCH 0/4] test-tool: split up "read-cache" tool Ævar Arnfjörð Bjarmason
2021-06-07 11:58 ` [PATCH 1/4] test-tool: split up test-tool read-cache Ævar Arnfjörð Bjarmason
2021-06-07 11:58 ` [PATCH 2/4] test-tools: migrate read-cache-perf to parse_options() Ævar Arnfjörð Bjarmason
2021-06-07 11:58 ` Ævar Arnfjörð Bjarmason [this message]
2021-06-07 11:58 ` [PATCH 4/4] read-cache perf: add a perf test for refresh_index() Ævar Arnfjörð Bjarmason
2021-06-07 22:50 ` [PATCH 0/4] test-tool: split up "read-cache" tool Junio C Hamano
2021-06-08 11:14 ` Ævar Arnfjörð Bjarmason
2021-06-08 23:26 ` Junio C Hamano
2021-06-30 22:02 ` Emily Shaffer
2021-06-30 22:24 ` Ævar Arnfjörð Bjarmason
2021-08-24 9:15 ` [PATCH v2 " Ævar Arnfjörð Bjarmason
2021-08-24 9:15 ` [PATCH v2 1/4] test-tool: split up test-tool read-cache Ævar Arnfjörð Bjarmason
2021-08-24 9:15 ` [PATCH v2 2/4] test-tool: migrate read-cache-perf to parse_options() Ævar Arnfjörð Bjarmason
2021-08-24 9:15 ` [PATCH v2 3/4] test-tool: migrate read-cache-again " Ævar Arnfjörð Bjarmason
2021-08-24 9:15 ` [PATCH v2 4/4] read-cache perf: add a perf test for refresh_index() Ævar Arnfjörð Bjarmason
2021-08-24 22:19 ` [PATCH v2 0/4] test-tool: split up "read-cache" tool Taylor Blau
2021-08-25 0:18 ` Junio C Hamano
2021-08-27 7:24 ` Ævar Arnfjörð Bjarmason
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=patch-3.4-36f4072b13-20210607T115454Z-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).