Merge branch 'js/t0001-case-insensitive' into maint

diff --git a/t/helper/test-tool.c b/t/helper/test-tool.c
index 50c55f8b1a3baf2df88214824b01fb707966ebc7..087a8c0cc9da64d7bc276c3870b2d0faba4c2627 100644 (file)
--- a/t/helper/test-tool.c
+++ b/t/helper/test-tool.c
@@ -1,5 +1,12 @@
 #include "git-compat-util.h"
 #include "test-tool.h"
+#include "trace2.h"
+#include "parse-options.h"
+
+static const char * const test_tool_usage[] = {
+       "test-tool [-C <directory>] <command [<arguments>...]]",
+       NULL
+};
 
 struct test_cmd {
        const char *name;
@@ -19,6 +26,7 @@ static struct test_cmd cmds[] = {
        { "dump-untracked-cache", cmd__dump_untracked_cache },
        { "example-decorate", cmd__example_decorate },
        { "genrandom", cmd__genrandom },
+       { "genzeros", cmd__genzeros },
        { "hashmap", cmd__hashmap },
        { "hash-speed", cmd__hash_speed },
        { "index-version", cmd__index_version },
@@ -41,6 +49,7 @@ static struct test_cmd cmds[] = {
        { "revision-walking", cmd__revision_walking },
        { "run-command", cmd__run_command },
        { "scrap-cache-tree", cmd__scrap_cache_tree },
+       { "serve-v2", cmd__serve_v2 },
        { "sha1", cmd__sha1 },
        { "sha1-array", cmd__sha1_array },
        { "sha256", cmd__sha256 },
@@ -50,6 +59,7 @@ static struct test_cmd cmds[] = {
        { "submodule-config", cmd__submodule_config },
        { "submodule-nested-repo-config", cmd__submodule_nested_repo_config },
        { "subprocess", cmd__subprocess },
+       { "trace2", cmd__trace2 },
        { "urlmatch-normalization", cmd__urlmatch_normalization },
        { "xml-encode", cmd__xml_encode },
        { "wildmatch", cmd__wildmatch },
@@ -72,15 +82,30 @@ static NORETURN void die_usage(void)
 int cmd_main(int argc, const char **argv)
 {
        int i;
+       const char *working_directory = NULL;
+       struct option options[] = {
+               OPT_STRING('C', NULL, &working_directory, "directory",
+                          "change the working directory"),
+               OPT_END()
+       };
 
        BUG_exit_code = 99;
+       argc = parse_options(argc, argv, NULL, options, test_tool_usage,
+                            PARSE_OPT_STOP_AT_NON_OPTION |
+                            PARSE_OPT_KEEP_ARGV0);
+
        if (argc < 2)
                die_usage();
 
+       if (working_directory && chdir(working_directory) < 0)
+               die("Could not cd to '%s'", working_directory);
+
        for (i = 0; i < ARRAY_SIZE(cmds); i++) {
                if (!strcmp(cmds[i].name, argv[1])) {
                        argv++;
                        argc--;
+                       trace2_cmd_name(cmds[i].name);
+                       trace2_cmd_list_config();
                        return cmds[i].fn(argc, argv);
                }
        }