t/helper: merge (unused) test-match-trees into test-tool
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nguyễn Thái Ngọc Duy committed
Mar 24, 2018 at 08:44 UTC
9080e75fbcaffaa5bb09b123b8f32719573d82f4
4 files changed
+5
-2
Makefile
+1
-1
@@ -665,13 +665,13 @@ TEST_BUILTINS_OBJS += test-genrandom.o
665
TEST_BUILTINS_OBJS += test-hashmap.o
666
TEST_BUILTINS_OBJS += test-index-version.o
667
TEST_BUILTINS_OBJS += test-lazy-init-name-hash.o
668
+TEST_BUILTINS_OBJS += test-match-trees.o
669
TEST_BUILTINS_OBJS += test-sha1.o
670
671
TEST_PROGRAMS_NEED_X += test-dump-fsmonitor
672
TEST_PROGRAMS_NEED_X += test-dump-untracked-cache
673
TEST_PROGRAMS_NEED_X += test-fake-ssh
674
TEST_PROGRAMS_NEED_X += test-line-buffer
674
-TEST_PROGRAMS_NEED_X += test-match-trees
675
TEST_PROGRAMS_NEED_X += test-mergesort
676
TEST_PROGRAMS_NEED_X += test-mktemp
677
TEST_PROGRAMS_NEED_X += test-online-cpus
t/helper/test-match-trees.c
+2
-1
@@ -1,7 +1,8 @@
1
+#include "test-tool.h"
2
#include "cache.h"
3
#include "tree.h"
4
4
-int cmd_main(int ac, const char **av)
5
+int cmd__match_trees(int ac, const char **av)
6
{
7
struct object_id hash1, hash2, shifted;
8
struct tree *one, *two;
t/helper/test-tool.c
+1
@@ -20,6 +20,7 @@ static struct test_cmd cmds[] = {
20
{ "hashmap", cmd__hashmap },
21
{ "index-version", cmd__index_version },
22
{ "lazy-init-name-hash", cmd__lazy_init_name_hash },
23
+ { "match-trees", cmd__match_trees },
24
{ "sha1", cmd__sha1 },
25
};
26
t/helper/test-tool.h
+1
@@ -14,6 +14,7 @@ int cmd__genrandom(int argc, const char **argv);
14
int cmd__hashmap(int argc, const char **argv);
15
int cmd__index_version(int argc, const char **argv);
16
int cmd__lazy_init_name_hash(int argc, const char **argv);
17
+int cmd__match_trees(int argc, const char **argv);
18
int cmd__sha1(int argc, const char **argv);
19
20
#endif