t/helper: merge test-ref-store 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>

diff --git a/Makefile b/Makefile
index 393fb9aca4b73f1b2236cacb0a41aa5d0fba3751..20080fddb8d03b9ff6f88d5e2f38bab1a8b189bc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -672,6 +672,7 @@ TEST_BUILTINS_OBJS += test-online-cpus.o
 TEST_BUILTINS_OBJS += test-path-utils.o
 TEST_BUILTINS_OBJS += test-prio-queue.o
 TEST_BUILTINS_OBJS += test-read-cache.o
 TEST_BUILTINS_OBJS += test-path-utils.o
 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-sha1.o
 
 TEST_PROGRAMS_NEED_X += test-dump-fsmonitor
 TEST_BUILTINS_OBJS += test-sha1.o
 
 TEST_PROGRAMS_NEED_X += test-dump-fsmonitor


@@ -680,7 +681,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-line-buffer
 TEST_PROGRAMS_NEED_X += test-parse-options
 TEST_PROGRAMS_NEED_X += test-write-cache

-TEST_PROGRAMS_NEED_X += test-ref-store

 TEST_PROGRAMS_NEED_X += test-regex
 TEST_PROGRAMS_NEED_X += test-revision-walking
 TEST_PROGRAMS_NEED_X += test-run-command
 TEST_PROGRAMS_NEED_X += test-regex
 TEST_PROGRAMS_NEED_X += test-revision-walking
 TEST_PROGRAMS_NEED_X += test-run-command

diff --git a/t/helper/test-ref-store.c b/t/helper/test-ref-store.c
index 7120634b04733bb8abe1f0622f0e1e9c8280b643..cdefb66a87c59b2e040ecbfd6b2b02415559ad12 100644 (file)
--- a/t/helper/test-ref-store.c
+++ b/t/helper/test-ref-store.c
@@ -1,3 +1,4 @@
+#include "test-tool.h"

 #include "cache.h"
 #include "refs.h"
 #include "worktree.h"
 #include "cache.h"
 #include "refs.h"
 #include "worktree.h"


@@ -274,7 +275,7 @@ static struct command commands[] = {
        { NULL, NULL }
 };
 
        { NULL, NULL }
 };
 

-int cmd_main(int argc, const char **argv)
+int cmd__ref_store(int argc, const char **argv)

 {
        struct ref_store *refs;
        const char *func;
 {
        struct ref_store *refs;
        const char *func;

diff --git a/t/helper/test-tool.c b/t/helper/test-tool.c
index 5bea2164629f88984dc247cba7d50e218e6fbd2e..706f88c482caa93cace6075541b78ffb31f94648 100644 (file)
--- a/t/helper/test-tool.c
+++ b/t/helper/test-tool.c
@@ -27,6 +27,7 @@ static struct test_cmd cmds[] = {
        { "path-utils", cmd__path_utils },
        { "prio-queue", cmd__prio_queue },
        { "read-cache", cmd__read_cache },
        { "path-utils", cmd__path_utils },
        { "prio-queue", cmd__prio_queue },
        { "read-cache", cmd__read_cache },

+       { "ref-store", cmd__ref_store },

        { "sha1", cmd__sha1 },
 };
 
        { "sha1", cmd__sha1 },
 };
 

diff --git a/t/helper/test-tool.h b/t/helper/test-tool.h
index 4d51c17f5a2bad98c464987e7aec2bf25ad250ef..2b5cc6e11703bf3daac4b5e716851f9e90a6fbbb 100644 (file)
--- a/t/helper/test-tool.h
+++ b/t/helper/test-tool.h
@@ -21,6 +21,7 @@ int cmd__online_cpus(int argc, const char **argv);
 int cmd__path_utils(int argc, const char **argv);
 int cmd__prio_queue(int argc, const char **argv);
 int cmd__read_cache(int argc, const char **argv);
 int cmd__path_utils(int argc, const char **argv);
 int cmd__prio_queue(int argc, const char **argv);
 int cmd__read_cache(int argc, const char **argv);

+int cmd__ref_store(int argc, const char **argv);

 int cmd__sha1(int argc, const char **argv);
 
 #endif
 int cmd__sha1(int argc, const char **argv);
 
 #endif

diff --git a/t/t1405-main-ref-store.sh b/t/t1405-main-ref-store.sh
index e8115df5bad8d9ef46542cfd3c96c32da0bfa4ad..a30a080b20c127faa0b6842cabb1afc6614e99bf 100755 (executable)
--- a/t/t1405-main-ref-store.sh
+++ b/t/t1405-main-ref-store.sh
@@ -4,7 +4,7 @@ test_description='test main ref store api'
 
 . ./test-lib.sh
 
 
 . ./test-lib.sh
 

-RUN="test-ref-store main"
+RUN="test-tool ref-store main"

 
 test_expect_success 'pack_refs(PACK_REFS_ALL | PACK_REFS_PRUNE)' '
        test_commit one &&
 
 test_expect_success 'pack_refs(PACK_REFS_ALL | PACK_REFS_PRUNE)' '
        test_commit one &&

diff --git a/t/t1406-submodule-ref-store.sh b/t/t1406-submodule-ref-store.sh
index c32d4cc4652a4496ce8fa6aa1c10c797ae7d760a..e093782cc37c495a122eb8676797b1988b828c29 100755 (executable)
--- a/t/t1406-submodule-ref-store.sh
+++ b/t/t1406-submodule-ref-store.sh
@@ -4,7 +4,7 @@ test_description='test submodule ref store api'
 
 . ./test-lib.sh
 
 
 . ./test-lib.sh
 

-RUN="test-ref-store submodule:sub"
+RUN="test-tool ref-store submodule:sub"

 
 test_expect_success 'setup' '
        git init sub &&
 
 test_expect_success 'setup' '
        git init sub &&

diff --git a/t/t1407-worktree-ref-store.sh b/t/t1407-worktree-ref-store.sh
index 8842d0329fb7947e811d4ffccff3bba9e8885d5d..2211f9831fb07f933c8c3f0c7cfd89cc5512c253 100755 (executable)
--- a/t/t1407-worktree-ref-store.sh
+++ b/t/t1407-worktree-ref-store.sh
@@ -4,8 +4,8 @@ test_description='test worktree ref store api'
 
 . ./test-lib.sh
 
 
 . ./test-lib.sh
 

-RWT="test-ref-store worktree:wt"
-RMAIN="test-ref-store worktree:main"
+RWT="test-tool ref-store worktree:wt"
+RMAIN="test-tool ref-store worktree:main"

 
 test_expect_success 'setup' '
        test_commit first &&
 
 test_expect_success 'setup' '
        test_commit first &&