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

t/helper: merge test-sigchain 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:58 +01:00
committed by Junio C Hamano
parent aa218dffcc
commit e154a6f3de
5 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -679,6 +679,7 @@ TEST_BUILTINS_OBJS += test-run-command.o
TEST_BUILTINS_OBJS += test-scrap-cache-tree.o TEST_BUILTINS_OBJS += test-scrap-cache-tree.o
TEST_BUILTINS_OBJS += test-sha1-array.o TEST_BUILTINS_OBJS += test-sha1-array.o
TEST_BUILTINS_OBJS += test-sha1.o TEST_BUILTINS_OBJS += test-sha1.o
TEST_BUILTINS_OBJS += test-sigchain.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
@ -686,7 +687,6 @@ TEST_PROGRAMS_NEED_X += test-fake-ssh
TEST_PROGRAMS_NEED_X += test-line-buffer TEST_PROGRAMS_NEED_X += test-line-buffer
TEST_PROGRAMS_NEED_X += test-parse-options TEST_PROGRAMS_NEED_X += test-parse-options
TEST_PROGRAMS_NEED_X += test-write-cache TEST_PROGRAMS_NEED_X += test-write-cache
TEST_PROGRAMS_NEED_X += test-sigchain
TEST_PROGRAMS_NEED_X += test-strcmp-offset TEST_PROGRAMS_NEED_X += test-strcmp-offset
TEST_PROGRAMS_NEED_X += test-string-list TEST_PROGRAMS_NEED_X += test-string-list
TEST_PROGRAMS_NEED_X += test-submodule-config TEST_PROGRAMS_NEED_X += test-submodule-config

3
t/helper/test-sigchain.c
View File

@ -1,3 +1,4 @@
#include "test-tool.h"
#include "cache.h" #include "cache.h"
#include "sigchain.h" #include "sigchain.h"
@ -13,7 +14,7 @@ X(two)
X(three) X(three)
#undef X #undef X
int cmd_main(int argc, const char **argv) { int cmd__sigchain(int argc, const char **argv) {
sigchain_push(SIGTERM, one); sigchain_push(SIGTERM, one);
sigchain_push(SIGTERM, two); sigchain_push(SIGTERM, two);
sigchain_push(SIGTERM, three); sigchain_push(SIGTERM, three);

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

@ -34,6 +34,7 @@ static struct test_cmd cmds[] = {
{ "scrap-cache-tree", cmd__scrap_cache_tree }, { "scrap-cache-tree", cmd__scrap_cache_tree },
{ "sha1-array", cmd__sha1_array }, { "sha1-array", cmd__sha1_array },
{ "sha1", cmd__sha1 }, { "sha1", cmd__sha1 },
{ "sigchain", cmd__sigchain },
}; };
int cmd_main(int argc, const char **argv) int cmd_main(int argc, const char **argv)

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

@ -28,5 +28,6 @@ int cmd__run_command(int argc, const char **argv);
int cmd__scrap_cache_tree(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_array(int argc, const char **argv);
int cmd__sha1(int argc, const char **argv); int cmd__sha1(int argc, const char **argv);
int cmd__sigchain(int argc, const char **argv);
#endif #endif

4
t/t0005-signals.sh
View File

@ -10,7 +10,7 @@ one
EOF EOF
test_expect_success 'sigchain works' ' test_expect_success 'sigchain works' '
{ test-sigchain >actual; ret=$?; } && { test-tool sigchain >actual; ret=$?; } &&
{ {
# Signal death by raise() on Windows acts like exit(3), # Signal death by raise() on Windows acts like exit(3),
# regardless of the signal number. So we must allow that # regardless of the signal number. So we must allow that
@ -24,7 +24,7 @@ test_expect_success 'sigchain works' '
test_expect_success !MINGW 'signals are propagated using shell convention' ' test_expect_success !MINGW 'signals are propagated using shell convention' '
# we use exec here to avoid any sub-shell interpretation # we use exec here to avoid any sub-shell interpretation
# of the exit code # of the exit code
git config alias.sigterm "!exec test-sigchain" && git config alias.sigterm "!exec test-tool sigchain" &&
test_expect_code 143 git sigterm test_expect_code 143 git sigterm
' '