From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: "SZEDER Gábor" <szeder.dev@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 04/20] t0040-parse-options: test parse_options() with various 'parse_opt_flags'
Date: Mon, 25 Jul 2022 16:38:48 +0200 [thread overview]
Message-ID: <220725.86edy9p85i.gmgdl@evledraar.gmail.com> (raw)
In-Reply-To: <20220725123857.2773963-5-szeder.dev@gmail.com>
On Mon, Jul 25 2022, SZEDER Gábor wrote:
> In 't0040-parse-options.sh' we thoroughly test the parsing of all
> types and forms of options, but in all those tests parse_options() is
> always invoked with a 0 flags parameter.
>
> Add a few tests to demonstrate how various 'enum parse_opt_flags'
> values are supposed to influence option parsing.
>
> Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
> ---
> t/helper/test-parse-options.c | 61 ++++++++++++++++++++++++++++++
> t/helper/test-tool.c | 1 +
> t/helper/test-tool.h | 1 +
> t/t0040-parse-options.sh | 70 +++++++++++++++++++++++++++++++++++
> 4 files changed, 133 insertions(+)
>
> diff --git a/t/helper/test-parse-options.c b/t/helper/test-parse-options.c
> index 48d3cf6692..32b906bd6a 100644
> --- a/t/helper/test-parse-options.c
> +++ b/t/helper/test-parse-options.c
> @@ -192,3 +192,64 @@ int cmd__parse_options(int argc, const char **argv)
>
> return ret;
> }
> +
> +static int parse_options_flags__cmd(int argc, const char **argv,
> + enum parse_opt_flags test_flags)
> +{
> + const char *usage[] = {
> + "<...> cmd [options]",
> + NULL
> + };
> + int opt = 0;
> + const struct option options[] = {
> + OPT_INTEGER('o', "opt", &opt, "an integer option"),
> + OPT_END()
> + };
> +
> + argc = parse_options(argc, argv, NULL, options, usage, test_flags);
> +
> + printf("opt: %d\n", opt);
> + for (int i = 0; i < argc; i++)
> + printf("arg %02d: %s\n", i, argv[i]);
> +
> + return 0;
> +}
> +
> +static enum parse_opt_flags test_flags = 0;
> +static const struct option test_flag_options[] = {
> + OPT_GROUP("flag-options:"),
> + OPT_BIT(0, "keep-dashdash", &test_flags,
> + "pass PARSE_OPT_KEEP_DASHDASH to parse_options()",
> + PARSE_OPT_KEEP_DASHDASH),
> + OPT_BIT(0, "stop-at-non-option", &test_flags,
> + "pass PARSE_OPT_STOP_AT_NON_OPTION to parse_options()",
> + PARSE_OPT_STOP_AT_NON_OPTION),
> + OPT_BIT(0, "keep-argv0", &test_flags,
> + "pass PARSE_OPT_KEEP_ARGV0 to parse_options()",
> + PARSE_OPT_KEEP_ARGV0),
> + OPT_BIT(0, "keep-unknown", &test_flags,
> + "pass PARSE_OPT_KEEP_UNKNOWN to parse_options()",
> + PARSE_OPT_KEEP_UNKNOWN),
> + OPT_BIT(0, "no-internal-help", &test_flags,
> + "pass PARSE_OPT_NO_INTERNAL_HELP to parse_options()",
> + PARSE_OPT_NO_INTERNAL_HELP),
> + OPT_END()
> +};
> +
> +int cmd__parse_options_flags(int argc, const char **argv)
> +{
> + const char *usage[] = {
> + "test-tool parse-options-flags [flag-options] cmd [options]",
> + NULL
> + };
> +
> + argc = parse_options(argc, argv, NULL, test_flag_options, usage,
> + PARSE_OPT_STOP_AT_NON_OPTION);
> +
> + if (argc == 0 || strcmp(argv[0], "cmd")) {
> + error("'cmd' is mandatory");
> + usage_with_options(usage, test_flag_options);
> + }
> +
> + return parse_options_flags__cmd(argc, argv, test_flags);
> +}
> diff --git a/t/helper/test-tool.c b/t/helper/test-tool.c
> index 318fdbab0c..6e62282b60 100644
> --- a/t/helper/test-tool.c
> +++ b/t/helper/test-tool.c
> @@ -51,6 +51,7 @@ static struct test_cmd cmds[] = {
> { "online-cpus", cmd__online_cpus },
> { "pack-mtimes", cmd__pack_mtimes },
> { "parse-options", cmd__parse_options },
> + { "parse-options-flags", cmd__parse_options_flags },
> { "parse-pathspec-file", cmd__parse_pathspec_file },
> { "partial-clone", cmd__partial_clone },
> { "path-utils", cmd__path_utils },
I wanted to add some new parse_options() code to
t/helper/test-parse-options.c in the past, but was stymied by its
cmd_*() going through a singular parse_options().
So just creating a new callback is a neat solution.
But wouldn't it be better to just create a new
t/helper/test-parse-options-something-.c & test file? It seems this
doesn't really share anything with the current helper & tests...
next prev parent reply other threads:[~2022-07-25 14:41 UTC|newest]
Thread overview: 97+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-25 12:38 [PATCH 00/20] parse-options: handle subcommands SZEDER Gábor
2022-07-25 12:38 ` [PATCH 01/20] git.c: update NO_PARSEOPT markings SZEDER Gábor
2022-07-25 14:31 ` Ævar Arnfjörð Bjarmason
2022-08-02 17:37 ` SZEDER Gábor
2022-08-02 21:00 ` Junio C Hamano
2022-08-03 13:11 ` Ævar Arnfjörð Bjarmason
2022-08-03 21:34 ` SZEDER Gábor
2022-08-04 7:47 ` Ævar Arnfjörð Bjarmason
2022-08-11 21:35 ` Junio C Hamano
2022-08-12 15:28 ` SZEDER Gábor
2022-08-12 16:46 ` Junio C Hamano
2022-07-26 19:55 ` SZEDER Gábor
2022-07-25 12:38 ` [PATCH 02/20] t3301-notes.sh: check that default operation mode doesn't take arguments SZEDER Gábor
2022-07-25 12:38 ` [PATCH 03/20] t5505-remote.sh: check the behavior without a subcommand SZEDER Gábor
2022-07-25 14:37 ` Ævar Arnfjörð Bjarmason
2022-07-25 12:38 ` [PATCH 04/20] t0040-parse-options: test parse_options() with various 'parse_opt_flags' SZEDER Gábor
2022-07-25 14:38 ` Ævar Arnfjörð Bjarmason [this message]
2022-08-12 15:04 ` SZEDER Gábor
2022-07-25 12:38 ` [PATCH 05/20] api-parse-options.txt: fix description of OPT_CMDMODE SZEDER Gábor
2022-07-25 12:38 ` [PATCH 06/20] parse-options: PARSE_OPT_KEEP_UNKNOWN only applies to --options SZEDER Gábor
2022-07-25 12:38 ` [PATCH 07/20] parse-options: clarify the limitations of PARSE_OPT_NODASH SZEDER Gábor
2022-07-25 12:38 ` [PATCH 08/20] parse-options: drop leading space from '--git-completion-helper' output SZEDER Gábor
2022-07-25 12:38 ` [PATCH 09/20] parse-options: add support for parsing subcommands SZEDER Gábor
2022-07-25 14:43 ` Ævar Arnfjörð Bjarmason
2022-07-25 19:29 ` SZEDER Gábor
2022-07-25 19:41 ` Ævar Arnfjörð Bjarmason
2022-07-25 21:02 ` SZEDER Gábor
2022-08-12 15:15 ` SZEDER Gábor
2022-07-25 17:37 ` Junio C Hamano
2022-07-25 12:38 ` [PATCH 10/20] builtin/bundle.c: let parse-options parse subcommands SZEDER Gábor
2022-07-25 12:38 ` [PATCH 11/20] builtin/commit-graph.c: " SZEDER Gábor
2022-07-25 12:38 ` [PATCH 12/20] builtin/gc.c: let parse-options parse 'git maintenance's subcommands SZEDER Gábor
2022-07-25 12:38 ` [PATCH 13/20] builtin/hook.c: let parse-option parse subcommands SZEDER Gábor
2022-07-25 12:38 ` [PATCH 14/20] builtin/multi-pack-index.c: let parse-options " SZEDER Gábor
2022-07-25 12:38 ` [PATCH 15/20] builtin/notes.c: " SZEDER Gábor
2022-07-25 16:49 ` Junio C Hamano
2022-07-25 12:38 ` [PATCH 16/20] builtin/reflog.c: " SZEDER Gábor
2022-07-25 12:38 ` [PATCH 17/20] builtin/remote.c: " SZEDER Gábor
2022-07-25 12:38 ` [PATCH 18/20] builtin/sparse-checkout.c: " SZEDER Gábor
2022-07-25 12:38 ` [PATCH 19/20] builtin/stash.c: " SZEDER Gábor
2022-07-25 12:38 ` [PATCH 20/20] builtin/worktree.c: " SZEDER Gábor
2022-07-25 13:15 ` [PATCH 00/20] parse-options: handle subcommands Derrick Stolee
2022-07-25 16:00 ` SZEDER Gábor
2022-07-25 16:08 ` Derrick Stolee
2022-07-25 17:13 ` Ævar Arnfjörð Bjarmason
2022-07-25 17:56 ` Junio C Hamano
2022-07-26 15:42 ` Johannes Schindelin
2022-07-26 18:02 ` Ævar Arnfjörð Bjarmason
2022-08-19 16:03 ` [PATCH v2 " SZEDER Gábor
2022-08-19 16:03 ` [PATCH v2 01/20] git.c: update NO_PARSEOPT markings SZEDER Gábor
2022-08-19 16:03 ` [PATCH v2 02/20] t3301-notes.sh: check that default operation mode doesn't take arguments SZEDER Gábor
2022-08-19 16:03 ` [PATCH v2 03/20] t5505-remote.sh: check the behavior without a subcommand SZEDER Gábor
2022-08-19 16:03 ` [PATCH v2 04/20] t0040-parse-options: test parse_options() with various 'parse_opt_flags' SZEDER Gábor
2022-08-19 17:23 ` Ævar Arnfjörð Bjarmason
2022-08-20 11:14 ` SZEDER Gábor
2022-08-19 18:18 ` Junio C Hamano
2022-08-20 10:31 ` SZEDER Gábor
2022-08-20 21:27 ` Junio C Hamano
2022-08-19 16:03 ` [PATCH v2 05/20] api-parse-options.txt: fix description of OPT_CMDMODE SZEDER Gábor
2022-08-19 16:03 ` [PATCH v2 06/20] parse-options: PARSE_OPT_KEEP_UNKNOWN only applies to --options SZEDER Gábor
2022-08-19 16:03 ` [PATCH v2 07/20] parse-options: clarify the limitations of PARSE_OPT_NODASH SZEDER Gábor
2022-08-19 16:03 ` [PATCH v2 08/20] parse-options: drop leading space from '--git-completion-helper' output SZEDER Gábor
2022-08-19 17:30 ` Ævar Arnfjörð Bjarmason
2022-08-19 18:35 ` SZEDER Gábor
2022-08-19 16:04 ` [PATCH v2 09/20] parse-options: add support for parsing subcommands SZEDER Gábor
2022-08-19 17:33 ` Ævar Arnfjörð Bjarmason
2022-08-19 19:03 ` Ævar Arnfjörð Bjarmason
2022-08-19 16:04 ` [PATCH v2 10/20] builtin/bundle.c: let parse-options parse subcommands SZEDER Gábor
2022-08-19 17:50 ` Ævar Arnfjörð Bjarmason
2022-08-19 16:04 ` [PATCH v2 11/20] builtin/commit-graph.c: " SZEDER Gábor
2022-08-19 17:53 ` Ævar Arnfjörð Bjarmason
2022-08-19 17:56 ` Ævar Arnfjörð Bjarmason
2022-08-19 18:22 ` SZEDER Gábor
2022-08-19 16:04 ` [PATCH v2 12/20] builtin/gc.c: let parse-options parse 'git maintenance's subcommands SZEDER Gábor
2022-08-19 20:59 ` Junio C Hamano
2022-08-19 16:04 ` [PATCH v2 13/20] builtin/hook.c: let parse-options parse subcommands SZEDER Gábor
2022-08-19 16:04 ` [PATCH v2 14/20] builtin/multi-pack-index.c: " SZEDER Gábor
2022-08-19 17:57 ` Ævar Arnfjörð Bjarmason
2022-08-19 16:04 ` [PATCH v2 15/20] builtin/notes.c: " SZEDER Gábor
2022-08-19 18:01 ` Ævar Arnfjörð Bjarmason
2022-08-21 17:56 ` SZEDER Gábor
2022-08-19 16:04 ` [PATCH v2 16/20] builtin/reflog.c: " SZEDER Gábor
2022-08-19 18:08 ` Ævar Arnfjörð Bjarmason
2022-08-19 16:04 ` [PATCH v2 17/20] builtin/remote.c: " SZEDER Gábor
2022-08-19 16:04 ` [PATCH v2 18/20] builtin/sparse-checkout.c: " SZEDER Gábor
2022-08-19 16:04 ` [PATCH v2 19/20] builtin/stash.c: " SZEDER Gábor
2022-08-19 19:06 ` Ævar Arnfjörð Bjarmason
2022-08-20 10:27 ` SZEDER Gábor
2022-08-19 16:04 ` [PATCH v2 20/20] builtin/worktree.c: " SZEDER Gábor
2022-09-05 18:50 ` [PATCH 0/5] parse-options: minor cleanups for handling subcommands SZEDER Gábor
2022-09-05 18:50 ` [PATCH 1/5] t0040-parse-options: remove leftover debugging SZEDER Gábor
2022-09-05 18:50 ` [PATCH 2/5] test-parse-options.c: don't use for loop initial declaration SZEDER Gábor
2022-09-05 18:50 ` [PATCH 3/5] test-parse-options.c: fix style of comparison with zero SZEDER Gábor
2022-09-05 18:50 ` [PATCH 4/5] notes: simplify default operation mode arguments check SZEDER Gábor
2022-09-05 18:50 ` [PATCH 5/5] notes, remote: show unknown subcommands between `' SZEDER Gábor
2022-09-07 19:12 ` [PATCH 0/5] parse-options: minor cleanups for handling subcommands Junio C Hamano
2022-09-07 21:22 ` SZEDER Gábor
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=220725.86edy9p85i.gmgdl@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=szeder.dev@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.
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).