mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t/helper: merge test-hashmap into test-tool

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2018-03-24 08:44:43 +01:00
committed by Junio C Hamano
parent c680668d1a
commit 7c18cbd562
5 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -662,13 +662,13 @@ TEST_BUILTINS_OBJS += test-dump-cache-tree.o
TEST_BUILTINS_OBJS += test-dump-split-index.o TEST_BUILTINS_OBJS += test-dump-split-index.o
TEST_BUILTINS_OBJS += test-example-decorate.o TEST_BUILTINS_OBJS += test-example-decorate.o
TEST_BUILTINS_OBJS += test-genrandom.o TEST_BUILTINS_OBJS += test-genrandom.o
TEST_BUILTINS_OBJS += test-hashmap.o
TEST_BUILTINS_OBJS += test-lazy-init-name-hash.o TEST_BUILTINS_OBJS += test-lazy-init-name-hash.o
TEST_BUILTINS_OBJS += test-sha1.o TEST_BUILTINS_OBJS += test-sha1.o
TEST_PROGRAMS_NEED_X += test-dump-fsmonitor TEST_PROGRAMS_NEED_X += test-dump-fsmonitor
TEST_PROGRAMS_NEED_X += test-dump-untracked-cache TEST_PROGRAMS_NEED_X += test-dump-untracked-cache
TEST_PROGRAMS_NEED_X += test-fake-ssh TEST_PROGRAMS_NEED_X += test-fake-ssh
TEST_PROGRAMS_NEED_X += test-hashmap
TEST_PROGRAMS_NEED_X += test-index-version TEST_PROGRAMS_NEED_X += test-index-version
TEST_PROGRAMS_NEED_X += test-line-buffer TEST_PROGRAMS_NEED_X += test-line-buffer
TEST_PROGRAMS_NEED_X += test-match-trees TEST_PROGRAMS_NEED_X += test-match-trees

5
t/helper/test-hashmap.c
View File

@ -1,3 +1,4 @@
#include "test-tool.h"
#include "git-compat-util.h" #include "git-compat-util.h"
#include "hashmap.h" #include "hashmap.h"
#include "strbuf.h" #include "strbuf.h"
@ -77,7 +78,7 @@ static unsigned int hash(unsigned int method, unsigned int i, const char *key)
/* /*
* Test performance of hashmap.[ch] * Test performance of hashmap.[ch]
* Usage: time echo "perfhashmap method rounds" | test-hashmap * Usage: time echo "perfhashmap method rounds" | test-tool hashmap
*/ */
static void perf_hashmap(unsigned int method, unsigned int rounds) static void perf_hashmap(unsigned int method, unsigned int rounds)
{ {
@ -144,7 +145,7 @@ static void perf_hashmap(unsigned int method, unsigned int rounds)
* *
* perfhashmap method rounds -> test hashmap.[ch] performance * perfhashmap method rounds -> test hashmap.[ch] performance
*/ */
int cmd_main(int argc, const char **argv) int cmd__hashmap(int argc, const char **argv)
{ {
struct strbuf line = STRBUF_INIT; struct strbuf line = STRBUF_INIT;
struct hashmap map; struct hashmap map;

1
t/helper/test-tool.c
View File

@ -17,6 +17,7 @@ static struct test_cmd cmds[] = {
{ "dump-split-index", cmd__dump_split_index }, { "dump-split-index", cmd__dump_split_index },
{ "example-decorate", cmd__example_decorate }, { "example-decorate", cmd__example_decorate },
{ "genrandom", cmd__genrandom }, { "genrandom", cmd__genrandom },
{ "hashmap", cmd__hashmap },
{ "lazy-init-name-hash", cmd__lazy_init_name_hash }, { "lazy-init-name-hash", cmd__lazy_init_name_hash },
{ "sha1", cmd__sha1 }, { "sha1", cmd__sha1 },
}; };

1
t/helper/test-tool.h
View File

@ -11,6 +11,7 @@ int cmd__dump_cache_tree(int argc, const char **argv);
int cmd__dump_split_index(int argc, const char **argv); int cmd__dump_split_index(int argc, const char **argv);
int cmd__example_decorate(int argc, const char **argv); int cmd__example_decorate(int argc, const char **argv);
int cmd__genrandom(int argc, const char **argv); int cmd__genrandom(int argc, const char **argv);
int cmd__hashmap(int argc, const char **argv);
int cmd__lazy_init_name_hash(int argc, const char **argv); int cmd__lazy_init_name_hash(int argc, const char **argv);
int cmd__sha1(int argc, const char **argv); int cmd__sha1(int argc, const char **argv);

4
t/t0011-hashmap.sh
View File

@ -4,7 +4,7 @@ test_description='test hashmap and string hash functions'
. ./test-lib.sh . ./test-lib.sh
test_hashmap() { test_hashmap() {
echo "$1" | test-hashmap $3 > actual && echo "$1" | test-tool hashmap $3 > actual &&
echo "$2" > expect && echo "$2" > expect &&
test_cmp expect actual test_cmp expect actual
} }
@ -232,7 +232,7 @@ test_expect_success 'grow / shrink' '
echo value40 >> expect && echo value40 >> expect &&
echo size >> in && echo size >> in &&
echo 64 39 >> expect && echo 64 39 >> expect &&
cat in | test-hashmap > out && cat in | test-tool hashmap > out &&
test_cmp expect out test_cmp expect out
' '