[PATCH 25/36] t/helper: merge test-revision-walking into test-tool
From: Nguyễn Thái Ngọc Duy <hidden>
Date: 2018-03-17 07:56:44
Subsystem:
kernel build + files below scripts/ (unless maintained elsewhere), the rest · Maintainers:
Nathan Chancellor, Nicolas Schier, Linus Torvalds
Signed-off-by: Nguyễn Thái Ngọc Duy <redacted> --- Makefile | 2 +- t/helper/test-revision-walking.c | 3 ++- t/helper/test-tool.c | 1 + t/helper/test-tool.h | 1 + t/t0062-revision-walking.sh | 2 +- 5 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 7444c00bbb..3ed461cd55 100644
--- a/Makefile
+++ b/Makefile@@ -674,6 +674,7 @@ TEST_BUILTINS_OBJS += test-prio-queue.o TEST_BUILTINS_OBJS += test-read-cache.o TEST_BUILTINS_OBJS += test-ref-store.o TEST_BUILTINS_OBJS += test-regex.o +TEST_BUILTINS_OBJS += test-revision-walking.o TEST_BUILTINS_OBJS += test-sha1.o TEST_PROGRAMS_NEED_X += test-dump-fsmonitor
@@ -682,7 +683,6 @@ TEST_PROGRAMS_NEED_X += test-fake-ssh TEST_PROGRAMS_NEED_X += test-line-buffer TEST_PROGRAMS_NEED_X += test-parse-options TEST_PROGRAMS_NEED_X += test-write-cache -TEST_PROGRAMS_NEED_X += test-revision-walking TEST_PROGRAMS_NEED_X += test-run-command TEST_PROGRAMS_NEED_X += test-scrap-cache-tree TEST_PROGRAMS_NEED_X += test-sha1-array
diff --git a/t/helper/test-revision-walking.c b/t/helper/test-revision-walking.c
index b8e6fe1d00..467d710da8 100644
--- a/t/helper/test-revision-walking.c
+++ b/t/helper/test-revision-walking.c@@ -8,6 +8,7 @@ * published by the Free Software Foundation. */ +#include "test-tool.h" #include "cache.h" #include "commit.h" #include "diff.h"
@@ -45,7 +46,7 @@ static int run_revision_walk(void) return got_revision; } -int cmd_main(int argc, const char **argv) +int test_revision_walking(int argc, const char **argv) { if (argc < 2) return 1;
diff --git a/t/helper/test-tool.c b/t/helper/test-tool.c
index 7352bd40e8..4586ae9440 100644
--- a/t/helper/test-tool.c
+++ b/t/helper/test-tool.c@@ -29,6 +29,7 @@ static struct test_cmd cmds[] = { { "read-cache", test_read_cache }, { "ref-store", test_ref_store }, { "regex", test_regex }, + { "revision-walking", test_revision_walking }, { "sha1", test_sha1 }, };
diff --git a/t/helper/test-tool.h b/t/helper/test-tool.h
index 3cb2fd9509..9bbdb05848 100644
--- a/t/helper/test-tool.h
+++ b/t/helper/test-tool.h@@ -23,6 +23,7 @@ int test_prio_queue(int argc, const char **argv); int test_read_cache(int argc, const char **argv); int test_ref_store(int argc, const char **argv); int test_regex(int argc, const char **argv); +int test_revision_walking(int argc, const char **argv); int test_sha1(int argc, const char **argv); #endif
diff --git a/t/t0062-revision-walking.sh b/t/t0062-revision-walking.sh
index 113c728e67..8e215867b8 100755
--- a/t/t0062-revision-walking.sh
+++ b/t/t0062-revision-walking.sh@@ -26,7 +26,7 @@ test_expect_success 'setup' ' ' test_expect_success 'revision walking can be done twice' ' - test-revision-walking run-twice >run_twice_actual && + test-tool revision-walking run-twice >run_twice_actual && test_cmp run_twice_expected run_twice_actual '
--
2.16.2.903.gd04caf5039