Merge branch 'cc/test-oidmap'

diff --git a/t/helper/test-tool.c b/t/helper/test-tool.c
index 4bf3666b43d318820d847e9969d00105f41c5972..1eac25233f7ce62ecb00b2d1e3d06d1423c3581f 100644 (file)
--- a/t/helper/test-tool.c
+++ b/t/helper/test-tool.c
@@ -1,5 +1,6 @@
 #include "git-compat-util.h"
 #include "test-tool.h"
+#include "trace2.h"
 #include "parse-options.h"
 
 static const char * const test_tool_usage[] = {
@@ -34,6 +35,7 @@ static struct test_cmd cmds[] = {
        { "match-trees", cmd__match_trees },
        { "mergesort", cmd__mergesort },
        { "mktemp", cmd__mktemp },
+       { "oidmap", cmd__oidmap },
        { "online-cpus", cmd__online_cpus },
        { "parse-options", cmd__parse_options },
        { "path-utils", cmd__path_utils },
@@ -58,6 +60,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 },
@@ -102,6 +105,8 @@ int cmd_main(int argc, const char **argv)
                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);
                }
        }