Change the newly added (but then mostly copy/pasted) read-cache-perf
to use the parse_options() API. This will make things easier as we add
new options.
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@xxxxxxxxx>
---
t/helper/test-read-cache-perf.c | 26 ++++++++++++++++++++------
t/perf/p0002-read-cache.sh | 2 +-
2 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/t/helper/test-read-cache-perf.c b/t/helper/test-read-cache-perf.c
index 90176c010a..54ad0c3135 100644
--- a/t/helper/test-read-cache-perf.c
+++ b/t/helper/test-read-cache-perf.c
@@ -1,18 +1,32 @@
#include "test-tool.h"
#include "cache.h"
+#include "parse-options.h"
+
+static const char *read_cache_perf_usage[] = {
+ "test-tool read-cache-perf [<options>...]",
+ NULL
+};
int cmd__read_cache_perf(int argc, const char **argv)
{
struct repository *r = the_repository;
- int i, cnt = 1;
+ int cnt = -1;
+ struct option options[] = {
+ OPT_INTEGER(0, "count", &cnt, "number of passes"),
+ OPT_END()
+ };
- if (argc == 2)
- cnt = strtol(argv[1], NULL, 0);
- else
- die("usage: test-tool read-cache-perf [<count>]");
+ argc = parse_options(argc, argv, "test-tools", options,
+ read_cache_perf_usage, 0);
+ if (argc > 0)
+ usage_msg_opt("Too many arguments.", read_cache_perf_usage,
+ options);
+ if (cnt < 1)
+ usage_msg_opt("Need at least one pass.", read_cache_perf_usage,
+ options);
setup_git_directory();
- for (i = 0; i < cnt; i++) {
+ while (cnt--) {
repo_read_index(r);
discard_index(r->index);
}
diff --git a/t/perf/p0002-read-cache.sh b/t/perf/p0002-read-cache.sh
index d0ba5173fb..1762b64865 100755
--- a/t/perf/p0002-read-cache.sh
+++ b/t/perf/p0002-read-cache.sh
@@ -8,7 +8,7 @@ test_perf_default_repo
count=1000
test_perf "read_cache/discard_cache $count times" "
- test-tool read-cache-perf $count
+ test-tool read-cache-perf --count=$count
"
test_done
--
2.32.0.rc3.434.gd8aed1f08a7
