t/helper: merge test-lazy-init-name-hash 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 3c0d0474af54cb22a6405d6dfd5ae6fbc9a7b581..31287cedf23f1589280df6f54f55f7e38bec982e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -653,6 +653,7 @@ X =
 PROGRAMS += $(patsubst %.o,git-%$X,$(PROGRAM_OBJS))
 
 TEST_BUILTINS_OBJS += test-chmtime.o
 PROGRAMS += $(patsubst %.o,git-%$X,$(PROGRAM_OBJS))
 
 TEST_BUILTINS_OBJS += test-chmtime.o

+TEST_BUILTINS_OBJS += test-lazy-init-name-hash.o

 TEST_BUILTINS_OBJS += test-sha1.o
 
 TEST_PROGRAMS_NEED_X += test-ctype
 TEST_BUILTINS_OBJS += test-sha1.o
 
 TEST_PROGRAMS_NEED_X += test-ctype


@@ -669,7 +670,6 @@ TEST_PROGRAMS_NEED_X += test-fake-ssh
 TEST_PROGRAMS_NEED_X += test-genrandom
 TEST_PROGRAMS_NEED_X += test-hashmap
 TEST_PROGRAMS_NEED_X += test-index-version
 TEST_PROGRAMS_NEED_X += test-genrandom
 TEST_PROGRAMS_NEED_X += test-hashmap
 TEST_PROGRAMS_NEED_X += test-index-version

-TEST_PROGRAMS_NEED_X += test-lazy-init-name-hash

 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-line-buffer
 TEST_PROGRAMS_NEED_X += test-match-trees
 TEST_PROGRAMS_NEED_X += test-mergesort

diff --git a/t/helper/test-lazy-init-name-hash.c b/t/helper/test-lazy-init-name-hash.c
index 297fb01d61eded5d83d02175199efcd217376738..b99a37080d935fa27df4e372e0e8cddd9fd08b3c 100644 (file)
--- a/t/helper/test-lazy-init-name-hash.c
+++ b/t/helper/test-lazy-init-name-hash.c
@@ -1,3 +1,4 @@
+#include "test-tool.h"

 #include "cache.h"
 #include "parse-options.h"
 
 #include "cache.h"
 #include "parse-options.h"
 


@@ -184,14 +185,14 @@ static void analyze_run(void)
        }
 }
 
        }
 }
 

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

 {
        const char *usage[] = {
 {
        const char *usage[] = {

-               "test-lazy-init-name-hash -d (-s | -m)",
-               "test-lazy-init-name-hash -p [-c c]",
-               "test-lazy-init-name-hash -a a [--step s] [-c c]",
-               "test-lazy-init-name-hash (-s | -m) [-c c]",
-               "test-lazy-init-name-hash -s -m [-c c]",
+               "test-tool lazy-init-name-hash -d (-s | -m)",
+               "test-tool lazy-init-name-hash -p [-c c]",
+               "test-tool lazy-init-name-hash -a a [--step s] [-c c]",
+               "test-tool lazy-init-name-hash (-s | -m) [-c c]",
+               "test-tool lazy-init-name-hash -s -m [-c c]",

                NULL
        };
        struct option options[] = {
                NULL
        };
        struct option options[] = {

diff --git a/t/helper/test-tool.c b/t/helper/test-tool.c
index 11795130a695b87674480a1b8e13782c83729b16..f835e772c51bb6dd2f514a34ff19041ba476c8fb 100644 (file)
--- a/t/helper/test-tool.c
+++ b/t/helper/test-tool.c
@@ -8,6 +8,7 @@ struct test_cmd {
 
 static struct test_cmd cmds[] = {
        { "chmtime", cmd__chmtime },
 
 static struct test_cmd cmds[] = {
        { "chmtime", cmd__chmtime },

+       { "lazy-init-name-hash", cmd__lazy_init_name_hash },

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

diff --git a/t/helper/test-tool.h b/t/helper/test-tool.h
index a05b8bd14c4f1a79b787e597d12325a11e99654d..1dc4673c3aef1d2c40c6205b34b521fdfeb41a10 100644 (file)
--- a/t/helper/test-tool.h
+++ b/t/helper/test-tool.h
@@ -2,6 +2,7 @@
 #define __TEST_TOOL_H__
 
 int cmd__chmtime(int argc, const char **argv);
 #define __TEST_TOOL_H__
 
 int cmd__chmtime(int argc, const char **argv);

+int cmd__lazy_init_name_hash(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/perf/p0004-lazy-init-name-hash.sh b/t/perf/p0004-lazy-init-name-hash.sh
index 8de5a98cfc6c513bb35cd8355f3e831ab3a8007d..1afc08fe7f1990cdf7143f0dfd3cfaa66628ca73 100755 (executable)
--- a/t/perf/p0004-lazy-init-name-hash.sh
+++ b/t/perf/p0004-lazy-init-name-hash.sh
@@ -7,8 +7,8 @@ test_perf_large_repo
 test_checkout_worktree
 
 test_expect_success 'verify both methods build the same hashmaps' '
 test_checkout_worktree
 
 test_expect_success 'verify both methods build the same hashmaps' '

-       test-lazy-init-name-hash --dump --single >out.single &&
-       if test-lazy-init-name-hash --dump --multi >out.multi
+       test-tool lazy-init-name-hash --dump --single >out.single &&
+       if test-tool lazy-init-name-hash --dump --multi >out.multi

        then
                test_set_prereq REPO_BIG_ENOUGH_FOR_MULTI &&
                sort <out.single >sorted.single &&
        then
                test_set_prereq REPO_BIG_ENOUGH_FOR_MULTI &&
                sort <out.single >sorted.single &&


@@ -46,11 +46,11 @@ test_expect_success 'calibrate' '
 '
 
 test_perf "single-threaded, $desc" "
 '
 
 test_perf "single-threaded, $desc" "

-       test-lazy-init-name-hash --single --count=$count
+       test-tool lazy-init-name-hash --single --count=$count

 "
 
 test_perf REPO_BIG_ENOUGH_FOR_MULTI "multi-threaded, $desc" "
 "
 
 test_perf REPO_BIG_ENOUGH_FOR_MULTI "multi-threaded, $desc" "

-       test-lazy-init-name-hash --multi --count=$count
+       test-tool lazy-init-name-hash --multi --count=$count

 "
 
 test_done
 "
 
 test_done

diff --git a/t/t3008-ls-files-lazy-init-name-hash.sh b/t/t3008-ls-files-lazy-init-name-hash.sh
index bdf5198b7eff11f9a7bfb57239f5905d92fe4bf7..8df4aa7c99ca2966e56a07a455b1a1c8d51f56f8 100755 (executable)
--- a/t/t3008-ls-files-lazy-init-name-hash.sh
+++ b/t/t3008-ls-files-lazy-init-name-hash.sh
@@ -21,7 +21,7 @@ test_expect_success 'no buffer overflow in lazy_init_name_hash' '
        ) |
        sed "s/^/100644 $EMPTY_BLOB     /" |
        git update-index --index-info &&
        ) |
        sed "s/^/100644 $EMPTY_BLOB     /" |
        git update-index --index-info &&

-       test-lazy-init-name-hash -m
+       test-tool lazy-init-name-hash -m

 '
 
 test_done
 '
 
 test_done