t/helper: merge test-string-list 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>
Nguyễn Thái Ngọc Duy committed
Mar 24, 2018 at 08:45 UTC
c932a5ff2880a23f3f28823768a58b17b675d276
6 files changed
+30
-27
Makefile
+1
-1
@@ -681,6 +681,7 @@ TEST_BUILTINS_OBJS += test-sha1-array.o
681
TEST_BUILTINS_OBJS += test-sha1.o
682
TEST_BUILTINS_OBJS += test-sigchain.o
683
TEST_BUILTINS_OBJS += test-strcmp-offset.o
684
+TEST_BUILTINS_OBJS += test-string-list.o
685
686
TEST_PROGRAMS_NEED_X += test-dump-fsmonitor
687
TEST_PROGRAMS_NEED_X += test-dump-untracked-cache
@@ -688,7 +689,6 @@ TEST_PROGRAMS_NEED_X += test-fake-ssh
689
TEST_PROGRAMS_NEED_X += test-line-buffer
690
TEST_PROGRAMS_NEED_X += test-parse-options
691
TEST_PROGRAMS_NEED_X += test-write-cache
691
-TEST_PROGRAMS_NEED_X += test-string-list
692
TEST_PROGRAMS_NEED_X += test-submodule-config
693
TEST_PROGRAMS_NEED_X += test-subprocess
694
TEST_PROGRAMS_NEED_X += test-svn-fe
t/helper/test-string-list.c
+2
-1
@@ -1,3 +1,4 @@
1
+#include "test-tool.h"
2
#include "cache.h"
3
#include "string-list.h"
4
@@ -41,7 +42,7 @@ static int prefix_cb(struct string_list_item *item, void *cb_data)
42
return starts_with(item->string, prefix);
43
}
44
44
-int cmd_main(int argc, const char **argv)
45
+int cmd__string_list(int argc, const char **argv)
46
{
47
if (argc == 5 && !strcmp(argv[1], "split")) {
48
struct string_list list = STRING_LIST_INIT_DUP;
t/helper/test-tool.c
+1
@@ -36,6 +36,7 @@ static struct test_cmd cmds[] = {
36
{ "sha1", cmd__sha1 },
37
{ "sigchain", cmd__sigchain },
38
{ "strcmp-offset", cmd__strcmp_offset },
39
+ { "string-list", cmd__string_list },
40
};
41
42
int cmd_main(int argc, const char **argv)
t/helper/test-tool.h
+1
@@ -30,5 +30,6 @@ int cmd__sha1_array(int argc, const char **argv);
30
int cmd__sha1(int argc, const char **argv);
31
int cmd__sigchain(int argc, const char **argv);
32
int cmd__strcmp_offset(int argc, const char **argv);
33
+int cmd__string_list(int argc, const char **argv);
34
35
#endif
t/perf/p0071-sort.sh
+1
-1
@@ -16,7 +16,7 @@ test_perf 'sort(1)' '
16
'
17
18
test_perf 'string_list_sort()' '
19
- test-string-list sort <unsorted >actual
19
+ test-tool string-list sort <unsorted >actual
20
'
21
22
test_expect_success 'string_list_sort() sorts like sort(1)' '
t/t0063-string-list.sh
+24
-24
@@ -10,9 +10,9 @@ test_description='Test string list functionality'
10
test_split () {
11
cat >expected &&
12
test_expect_success "split $1 at $2, max $3" "
13
- test-string-list split '$1' '$2' '$3' >actual &&
13
+ test-tool string-list split '$1' '$2' '$3' >actual &&
14
test_cmp expected actual &&
15
- test-string-list split_in_place '$1' '$2' '$3' >actual &&
15
+ test-tool string-list split_in_place '$1' '$2' '$3' >actual &&
16
test_cmp expected actual
17
"
18
}
@@ -61,31 +61,31 @@ test_split ":" ":" "-1" <<EOF
61
EOF
62
63
test_expect_success "test filter_string_list" '
64
- test "x-" = "x$(test-string-list filter - y)" &&
65
- test "x-" = "x$(test-string-list filter no y)" &&
66
- test yes = "$(test-string-list filter yes y)" &&
67
- test yes = "$(test-string-list filter no:yes y)" &&
68
- test yes = "$(test-string-list filter yes:no y)" &&
69
- test y1:y2 = "$(test-string-list filter y1:y2 y)" &&
70
- test y2:y1 = "$(test-string-list filter y2:y1 y)" &&
71
- test "x-" = "x$(test-string-list filter x1:x2 y)"
64
+ test "x-" = "x$(test-tool string-list filter - y)" &&
65
+ test "x-" = "x$(test-tool string-list filter no y)" &&
66
+ test yes = "$(test-tool string-list filter yes y)" &&
67
+ test yes = "$(test-tool string-list filter no:yes y)" &&
68
+ test yes = "$(test-tool string-list filter yes:no y)" &&
69
+ test y1:y2 = "$(test-tool string-list filter y1:y2 y)" &&
70
+ test y2:y1 = "$(test-tool string-list filter y2:y1 y)" &&
71
+ test "x-" = "x$(test-tool string-list filter x1:x2 y)"
72
'
73
74
test_expect_success "test remove_duplicates" '
75
- test "x-" = "x$(test-string-list remove_duplicates -)" &&
76
- test "x" = "x$(test-string-list remove_duplicates "")" &&
77
- test a = "$(test-string-list remove_duplicates a)" &&
78
- test a = "$(test-string-list remove_duplicates a:a)" &&
79
- test a = "$(test-string-list remove_duplicates a:a:a:a:a)" &&
80
- test a:b = "$(test-string-list remove_duplicates a:b)" &&
81
- test a:b = "$(test-string-list remove_duplicates a:a:b)" &&
82
- test a:b = "$(test-string-list remove_duplicates a:b:b)" &&
83
- test a:b:c = "$(test-string-list remove_duplicates a:b:c)" &&
84
- test a:b:c = "$(test-string-list remove_duplicates a:a:b:c)" &&
85
- test a:b:c = "$(test-string-list remove_duplicates a:b:b:c)" &&
86
- test a:b:c = "$(test-string-list remove_duplicates a:b:c:c)" &&
87
- test a:b:c = "$(test-string-list remove_duplicates a:a:b:b:c:c)" &&
88
- test a:b:c = "$(test-string-list remove_duplicates a:a:a:b:b:b:c:c:c)"
75
+ test "x-" = "x$(test-tool string-list remove_duplicates -)" &&
76
+ test "x" = "x$(test-tool string-list remove_duplicates "")" &&
77
+ test a = "$(test-tool string-list remove_duplicates a)" &&
78
+ test a = "$(test-tool string-list remove_duplicates a:a)" &&
79
+ test a = "$(test-tool string-list remove_duplicates a:a:a:a:a)" &&
80
+ test a:b = "$(test-tool string-list remove_duplicates a:b)" &&
81
+ test a:b = "$(test-tool string-list remove_duplicates a:a:b)" &&
82
+ test a:b = "$(test-tool string-list remove_duplicates a:b:b)" &&
83
+ test a:b:c = "$(test-tool string-list remove_duplicates a:b:c)" &&
84
+ test a:b:c = "$(test-tool string-list remove_duplicates a:a:b:c)" &&
85
+ test a:b:c = "$(test-tool string-list remove_duplicates a:b:b:c)" &&
86
+ test a:b:c = "$(test-tool string-list remove_duplicates a:b:c:c)" &&
87
+ test a:b:c = "$(test-tool string-list remove_duplicates a:a:b:b:c:c)" &&
88
+ test a:b:c = "$(test-tool string-list remove_duplicates a:a:a:b:b:b:c:c:c)"
89
'
90
91
test_done