t/helper: merge (unused) test-delta 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 9153dde5e2ec0c424e5468aa2aff8cec04214770
4 files changed +6 -3
Makefile
+1 -1
@@ -656,10 +656,10 @@ TEST_BUILTINS_OBJS += test-chmtime.o
656 TEST_BUILTINS_OBJS += test-config.o
657 TEST_BUILTINS_OBJS += test-ctype.o
658 TEST_BUILTINS_OBJS += test-date.o
659 +TEST_BUILTINS_OBJS += test-delta.o
660 TEST_BUILTINS_OBJS += test-lazy-init-name-hash.o
661 TEST_BUILTINS_OBJS += test-sha1.o
662
662 -TEST_PROGRAMS_NEED_X += test-delta
663 TEST_PROGRAMS_NEED_X += test-drop-caches
664 TEST_PROGRAMS_NEED_X += test-dump-cache-tree
665 TEST_PROGRAMS_NEED_X += test-dump-fsmonitor
t/helper/test-delta.c
+3 -2
@@ -8,14 +8,15 @@
8 * published by the Free Software Foundation.
9 */
10
11 +#include "test-tool.h"
12 #include "git-compat-util.h"
13 #include "delta.h"
14 #include "cache.h"
15
16 static const char usage_str[] =
16 - "test-delta (-d|-p) <from_file> <data_file> <out_file>";
17 + "test-tool delta (-d|-p) <from_file> <data_file> <out_file>";
18
18 -int cmd_main(int argc, const char **argv)
19 +int cmd__delta(int argc, const char **argv)
20 {
21 int fd;
22 struct stat st;
t/helper/test-tool.c
+1
@@ -11,6 +11,7 @@ static struct test_cmd cmds[] = {
11 { "config", cmd__config },
12 { "ctype", cmd__ctype },
13 { "date", cmd__date },
14 + { "delta", cmd__delta },
15 { "lazy-init-name-hash", cmd__lazy_init_name_hash },
16 { "sha1", cmd__sha1 },
17 };
t/helper/test-tool.h
+1
@@ -5,6 +5,7 @@ int cmd__chmtime(int argc, const char **argv);
5 int cmd__config(int argc, const char **argv);
6 int cmd__ctype(int argc, const char **argv);
7 int cmd__date(int argc, const char **argv);
8 +int cmd__delta(int argc, const char **argv);
9 int cmd__lazy_init_name_hash(int argc, const char **argv);
10 int cmd__sha1(int argc, const char **argv);
11