development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-12 21:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

t/helper: merge test-run-command 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:55 +01:00 committed by Junio C Hamano
parent 77d4b8c832
commit ae6a51f5a1
5 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -675,6 +675,7 @@ TEST_BUILTINS_OBJS += test-read-cache.o
TEST_BUILTINS_OBJS += test-ref-store.o TEST_BUILTINS_OBJS += test-ref-store.o
TEST_BUILTINS_OBJS += test-regex.o TEST_BUILTINS_OBJS += test-regex.o
TEST_BUILTINS_OBJS += test-revision-walking.o TEST_BUILTINS_OBJS += test-revision-walking.o
TEST_BUILTINS_OBJS += test-run-command.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
@ -683,7 +684,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-run-command
TEST_PROGRAMS_NEED_X += test-scrap-cache-tree TEST_PROGRAMS_NEED_X += test-scrap-cache-tree
TEST_PROGRAMS_NEED_X += test-sha1-array TEST_PROGRAMS_NEED_X += test-sha1-array
TEST_PROGRAMS_NEED_X += test-sigchain TEST_PROGRAMS_NEED_X += test-sigchain

3
t/helper/test-run-command.c
View file

@ -8,6 +8,7 @@
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#include "test-tool.h"
#include "git-compat-util.h" #include "git-compat-util.h"
#include "run-command.h" #include "run-command.h"
#include "argv-array.h" #include "argv-array.h"
@ -49,7 +50,7 @@ static int task_finished(int result,
return 1; return 1;
} }
int cmd_main(int argc, const char **argv) int cmd__run_command(int argc, const char **argv)
{ {
struct child_process proc = CHILD_PROCESS_INIT; struct child_process proc = CHILD_PROCESS_INIT;
int jobs; int jobs;

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

@ -30,6 +30,7 @@ static struct test_cmd cmds[] = {
{ "ref-store", cmd__ref_store }, { "ref-store", cmd__ref_store },
{ "regex", cmd__regex }, { "regex", cmd__regex },
{ "revision-walking", cmd__revision_walking }, { "revision-walking", cmd__revision_walking },
{ "run-command", cmd__run_command },
{ "sha1", cmd__sha1 }, { "sha1", cmd__sha1 },
}; };

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

@ -24,6 +24,7 @@ int cmd__read_cache(int argc, const char **argv);
int cmd__ref_store(int argc, const char **argv); int cmd__ref_store(int argc, const char **argv);
int cmd__regex(int argc, const char **argv); int cmd__regex(int argc, const char **argv);
int cmd__revision_walking(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__sha1(int argc, const char **argv); int cmd__sha1(int argc, const char **argv);
#endif #endif

24
t/t0061-run-command.sh
View file

@ -14,13 +14,13 @@ EOF
>empty >empty
test_expect_success 'start_command reports ENOENT' ' test_expect_success 'start_command reports ENOENT' '
test-run-command start-command-ENOENT ./does-not-exist test-tool run-command start-command-ENOENT ./does-not-exist
' '
test_expect_success 'run_command can run a command' ' test_expect_success 'run_command can run a command' '
cat hello-script >hello.sh && cat hello-script >hello.sh &&
chmod +x hello.sh && chmod +x hello.sh &&
test-run-command run-command ./hello.sh >actual 2>err && test-tool run-command run-command ./hello.sh >actual 2>err &&
test_cmp hello-script actual && test_cmp hello-script actual &&
test_cmp empty err test_cmp empty err
@ -31,7 +31,7 @@ test_expect_success !MINGW 'run_command can run a script without a #! line' '
cat hello-script cat hello-script
EOF EOF
chmod +x hello && chmod +x hello &&
test-run-command run-command ./hello >actual 2>err && test-tool run-command run-command ./hello >actual 2>err &&
test_cmp hello-script actual && test_cmp hello-script actual &&
test_cmp empty err test_cmp empty err
@ -45,7 +45,7 @@ test_expect_success 'run_command does not try to execute a directory' '
EOF EOF
PATH=$PWD/bin1:$PWD/bin2:$PATH \ PATH=$PWD/bin1:$PWD/bin2:$PATH \
test-run-command run-command greet >actual 2>err && test-tool run-command run-command greet >actual 2>err &&
test_cmp bin2/greet actual && test_cmp bin2/greet actual &&
test_cmp empty err test_cmp empty err
' '
@ -62,7 +62,7 @@ test_expect_success POSIXPERM 'run_command passes over non-executable file' '
EOF EOF
PATH=$PWD/bin1:$PWD/bin2:$PATH \ PATH=$PWD/bin1:$PWD/bin2:$PATH \
test-run-command run-command greet >actual 2>err && test-tool run-command run-command greet >actual 2>err &&
test_cmp bin2/greet actual && test_cmp bin2/greet actual &&
test_cmp empty err test_cmp empty err
' '
@ -70,7 +70,7 @@ test_expect_success POSIXPERM 'run_command passes over non-executable file' '
test_expect_success POSIXPERM 'run_command reports EACCES' ' test_expect_success POSIXPERM 'run_command reports EACCES' '
cat hello-script >hello.sh && cat hello-script >hello.sh &&
chmod -x hello.sh && chmod -x hello.sh &&
test_must_fail test-run-command run-command ./hello.sh 2>err && test_must_fail test-tool run-command run-command ./hello.sh 2>err &&
grep "fatal: cannot exec.*hello.sh" err grep "fatal: cannot exec.*hello.sh" err
' '
@ -104,17 +104,17 @@ World
EOF EOF
test_expect_success 'run_command runs in parallel with more jobs available than tasks' ' test_expect_success 'run_command runs in parallel with more jobs available than tasks' '
test-run-command run-command-parallel 5 sh -c "printf \"%s\n%s\n\" Hello World" 2>actual && test-tool run-command run-command-parallel 5 sh -c "printf \"%s\n%s\n\" Hello World" 2>actual &&
test_cmp expect actual test_cmp expect actual
' '
test_expect_success 'run_command runs in parallel with as many jobs as tasks' ' test_expect_success 'run_command runs in parallel with as many jobs as tasks' '
test-run-command run-command-parallel 4 sh -c "printf \"%s\n%s\n\" Hello World" 2>actual && test-tool run-command run-command-parallel 4 sh -c "printf \"%s\n%s\n\" Hello World" 2>actual &&
test_cmp expect actual test_cmp expect actual
' '
test_expect_success 'run_command runs in parallel with more tasks than jobs available' ' test_expect_success 'run_command runs in parallel with more tasks than jobs available' '
test-run-command run-command-parallel 3 sh -c "printf \"%s\n%s\n\" Hello World" 2>actual && test-tool run-command run-command-parallel 3 sh -c "printf \"%s\n%s\n\" Hello World" 2>actual &&
test_cmp expect actual test_cmp expect actual
' '
@ -128,7 +128,7 @@ asking for a quick stop
EOF EOF
test_expect_success 'run_command is asked to abort gracefully' ' test_expect_success 'run_command is asked to abort gracefully' '
test-run-command run-command-abort 3 false 2>actual && test-tool run-command run-command-abort 3 false 2>actual &&
test_cmp expect actual test_cmp expect actual
' '
@ -137,14 +137,14 @@ no further jobs available
EOF EOF
test_expect_success 'run_command outputs ' ' test_expect_success 'run_command outputs ' '
test-run-command run-command-no-jobs 3 sh -c "printf \"%s\n%s\n\" Hello World" 2>actual && test-tool run-command run-command-no-jobs 3 sh -c "printf \"%s\n%s\n\" Hello World" 2>actual &&
test_cmp expect actual test_cmp expect actual
' '
test_trace () { test_trace () {
expect="$1" expect="$1"
shift shift
GIT_TRACE=1 test-run-command "$@" run-command true 2>&1 >/dev/null | \ GIT_TRACE=1 test-tool run-command "$@" run-command true 2>&1 >/dev/null | \
sed 's/.* run_command: //' >actual && sed 's/.* run_command: //' >actual &&
echo "$expect true" >expect && echo "$expect true" >expect &&
test_cmp expect actual test_cmp expect actual