development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 18:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

t/helper: merge test-sha1-array 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:57 +01:00 committed by Junio C Hamano
parent ff5fb8b034
commit aa218dffcc
5 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -677,6 +677,7 @@ TEST_BUILTINS_OBJS += test-regex.o
TEST_BUILTINS_OBJS += test-revision-walking.o
TEST_BUILTINS_OBJS += test-run-command.o
TEST_BUILTINS_OBJS += test-scrap-cache-tree.o
TEST_BUILTINS_OBJS += test-sha1-array.o
TEST_BUILTINS_OBJS += test-sha1.o
TEST_PROGRAMS_NEED_X += test-dump-fsmonitor
@ -685,7 +686,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-sha1-array
TEST_PROGRAMS_NEED_X += test-sigchain
TEST_PROGRAMS_NEED_X += test-strcmp-offset
TEST_PROGRAMS_NEED_X += test-string-list

3
t/helper/test-sha1-array.c
View file

@ -1,3 +1,4 @@
#include "test-tool.h"
#include "cache.h"
#include "sha1-array.h"
@ -7,7 +8,7 @@ static int print_oid(const struct object_id *oid, void *data)
return 0;
}
int cmd_main(int argc, const char **argv)
int cmd__sha1_array(int argc, const char **argv)
{
struct oid_array array = OID_ARRAY_INIT;
struct strbuf line = STRBUF_INIT;

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

@ -32,6 +32,7 @@ static struct test_cmd cmds[] = {
{ "revision-walking", cmd__revision_walking },
{ "run-command", cmd__run_command },
{ "scrap-cache-tree", cmd__scrap_cache_tree },
{ "sha1-array", cmd__sha1_array },
{ "sha1", cmd__sha1 },
};

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

@ -26,6 +26,7 @@ int cmd__regex(int argc, const char **argv);
int cmd__revision_walking(int argc, const char **argv);
int cmd__run_command(int argc, const char **argv);
int cmd__scrap_cache_tree(int argc, const char **argv);
int cmd__sha1_array(int argc, const char **argv);
int cmd__sha1(int argc, const char **argv);
#endif

16
t/t0064-sha1-array.sh
View file

@ -18,7 +18,7 @@ test_expect_success 'ordered enumeration' '
{
echo20 append 88 44 aa 55 &&
echo for_each_unique
} | test-sha1-array >actual &&
} | test-tool sha1-array >actual &&
test_cmp expect actual
'
@ -28,7 +28,7 @@ test_expect_success 'ordered enumeration with duplicate suppression' '
echo20 append 88 44 aa 55 &&
echo20 append 88 44 aa 55 &&
echo for_each_unique
} | test-sha1-array >actual &&
} | test-tool sha1-array >actual &&
test_cmp expect actual
'
@ -36,7 +36,7 @@ test_expect_success 'lookup' '
{
echo20 append 88 44 aa 55 &&
echo20 lookup 55
} | test-sha1-array >actual &&
} | test-tool sha1-array >actual &&
n=$(cat actual) &&
test "$n" -eq 1
'
@ -45,7 +45,7 @@ test_expect_success 'lookup non-existing entry' '
{
echo20 append 88 44 aa 55 &&
echo20 lookup 33
} | test-sha1-array >actual &&
} | test-tool sha1-array >actual &&
n=$(cat actual) &&
test "$n" -lt 0
'
@ -55,7 +55,7 @@ test_expect_success 'lookup with duplicates' '
echo20 append 88 44 aa 55 &&
echo20 append 88 44 aa 55 &&
echo20 lookup 55
} | test-sha1-array >actual &&
} | test-tool sha1-array >actual &&
n=$(cat actual) &&
test "$n" -ge 2 &&
test "$n" -le 3
@ -66,7 +66,7 @@ test_expect_success 'lookup non-existing entry with duplicates' '
echo20 append 88 44 aa 55 &&
echo20 append 88 44 aa 55 &&
echo20 lookup 66
} | test-sha1-array >actual &&
} | test-tool sha1-array >actual &&
n=$(cat actual) &&
test "$n" -lt 0
'
@ -76,7 +76,7 @@ test_expect_success 'lookup with almost duplicate values' '
echo "append 5555555555555555555555555555555555555555" &&
echo "append 555555555555555555555555555555555555555f" &&
echo20 lookup 55
} | test-sha1-array >actual &&
} | test-tool sha1-array >actual &&
n=$(cat actual) &&
test "$n" -eq 0
'
@ -85,7 +85,7 @@ test_expect_success 'lookup with single duplicate value' '
{
echo20 append 55 55 &&
echo20 lookup 55
} | test-sha1-array >actual &&
} | test-tool sha1-array >actual &&
n=$(cat actual) &&
test "$n" -ge 0 &&
test "$n" -le 1