t/helper: merge test-write-cache 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 2ab76c68383c8892a7bdc4f6a0668846a956c93b..8ad9a2a1a9a519b0f2cf1fa43e43ba277e6f2739 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -686,13 +686,13 @@ TEST_BUILTINS_OBJS += test-submodule-config.o
 TEST_BUILTINS_OBJS += test-subprocess.o
 TEST_BUILTINS_OBJS += test-urlmatch-normalization.o
 TEST_BUILTINS_OBJS += test-wildmatch.o
 TEST_BUILTINS_OBJS += test-subprocess.o
 TEST_BUILTINS_OBJS += test-urlmatch-normalization.o
 TEST_BUILTINS_OBJS += test-wildmatch.o

+TEST_BUILTINS_OBJS += test-write-cache.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-parse-options
 
 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-parse-options

-TEST_PROGRAMS_NEED_X += test-write-cache

 TEST_PROGRAMS_NEED_X += test-svn-fe
 TEST_PROGRAMS_NEED_X += test-tool
 
 TEST_PROGRAMS_NEED_X += test-svn-fe
 TEST_PROGRAMS_NEED_X += test-tool
 

diff --git a/t/helper/test-tool.c b/t/helper/test-tool.c
index 068adf47d684439230096e736c42c5cbb96d7902..87066ced62aca5641daafb83b696e01e12b436d5 100644 (file)
--- a/t/helper/test-tool.c
+++ b/t/helper/test-tool.c
@@ -41,6 +41,7 @@ static struct test_cmd cmds[] = {
        { "subprocess", cmd__subprocess },
        { "urlmatch-normalization", cmd__urlmatch_normalization },
        { "wildmatch", cmd__wildmatch },
        { "subprocess", cmd__subprocess },
        { "urlmatch-normalization", cmd__urlmatch_normalization },
        { "wildmatch", cmd__wildmatch },

+       { "write-cache", cmd__write_cache },

 };
 
 int cmd_main(int argc, const char **argv)
 };
 
 int cmd_main(int argc, const char **argv)

diff --git a/t/helper/test-tool.h b/t/helper/test-tool.h
index 84c583e68f6ae0309ff52ba943068d8396b54f5c..7116ddfb94398da98063b7efed77240058c6961f 100644 (file)
--- a/t/helper/test-tool.h
+++ b/t/helper/test-tool.h
@@ -35,5 +35,6 @@ int cmd__submodule_config(int argc, const char **argv);
 int cmd__subprocess(int argc, const char **argv);
 int cmd__urlmatch_normalization(int argc, const char **argv);
 int cmd__wildmatch(int argc, const char **argv);
 int cmd__subprocess(int argc, const char **argv);
 int cmd__urlmatch_normalization(int argc, const char **argv);
 int cmd__wildmatch(int argc, const char **argv);

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

 
 #endif
 
 #endif

diff --git a/t/helper/test-write-cache.c b/t/helper/test-write-cache.c
index b7ee0396692b6143e852af16695dd5800c0044be..017dc303800d9ba385a9836d85f81445c6b7e8b7 100644 (file)
--- a/t/helper/test-write-cache.c
+++ b/t/helper/test-write-cache.c
@@ -1,9 +1,10 @@
+#include "test-tool.h"

 #include "cache.h"
 #include "lockfile.h"
 
 static struct lock_file index_lock;
 
 #include "cache.h"
 #include "lockfile.h"
 
 static struct lock_file index_lock;
 

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

 {
        int i, cnt = 1, lockfd;
        if (argc == 2)
 {
        int i, cnt = 1, lockfd;
        if (argc == 2)

diff --git a/t/perf/p0007-write-cache.sh b/t/perf/p0007-write-cache.sh
index 261fe92fd93aaf65101dfe4d1b87741453985cbe..09595264f09fa4b1dc28b3e5d2a3d6482d998bcc 100755 (executable)
--- a/t/perf/p0007-write-cache.sh
+++ b/t/perf/p0007-write-cache.sh
@@ -23,7 +23,7 @@ test_expect_success "setup repo" '
 
 count=3
 test_perf "write_locked_index $count times ($nr_files files)" "
 
 count=3
 test_perf "write_locked_index $count times ($nr_files files)" "

-       test-write-cache $count
+       test-tool write-cache $count

 "
 
 test_done
 "
 
 test_done