Browse Source

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>
maint
Nguyễn Thái Ngọc Duy 7 years ago committed by Junio C Hamano
parent
commit
9080e75fbc
  1. 2
      Makefile
  2. 3
      t/helper/test-match-trees.c
  3. 1
      t/helper/test-tool.c
  4. 1
      t/helper/test-tool.h

2
Makefile

@ -665,13 +665,13 @@ TEST_BUILTINS_OBJS += test-genrandom.o @@ -665,13 +665,13 @@ TEST_BUILTINS_OBJS += test-genrandom.o
TEST_BUILTINS_OBJS += test-hashmap.o
TEST_BUILTINS_OBJS += test-index-version.o
TEST_BUILTINS_OBJS += test-lazy-init-name-hash.o
TEST_BUILTINS_OBJS += test-match-trees.o
TEST_BUILTINS_OBJS += test-sha1.o

TEST_PROGRAMS_NEED_X += test-dump-fsmonitor
TEST_PROGRAMS_NEED_X += test-dump-untracked-cache
TEST_PROGRAMS_NEED_X += test-fake-ssh
TEST_PROGRAMS_NEED_X += test-line-buffer
TEST_PROGRAMS_NEED_X += test-match-trees
TEST_PROGRAMS_NEED_X += test-mergesort
TEST_PROGRAMS_NEED_X += test-mktemp
TEST_PROGRAMS_NEED_X += test-online-cpus

3
t/helper/test-match-trees.c

@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
#include "test-tool.h"
#include "cache.h"
#include "tree.h"

int cmd_main(int ac, const char **av)
int cmd__match_trees(int ac, const char **av)
{
struct object_id hash1, hash2, shifted;
struct tree *one, *two;

1
t/helper/test-tool.c

@ -20,6 +20,7 @@ static struct test_cmd cmds[] = { @@ -20,6 +20,7 @@ static struct test_cmd cmds[] = {
{ "hashmap", cmd__hashmap },
{ "index-version", cmd__index_version },
{ "lazy-init-name-hash", cmd__lazy_init_name_hash },
{ "match-trees", cmd__match_trees },
{ "sha1", cmd__sha1 },
};


1
t/helper/test-tool.h

@ -14,6 +14,7 @@ int cmd__genrandom(int argc, const char **argv); @@ -14,6 +14,7 @@ int cmd__genrandom(int argc, const char **argv);
int cmd__hashmap(int argc, const char **argv);
int cmd__index_version(int argc, const char **argv);
int cmd__lazy_init_name_hash(int argc, const char **argv);
int cmd__match_trees(int argc, const char **argv);
int cmd__sha1(int argc, const char **argv);

#endif

Loading…
Cancel
Save