mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
t/helper: merge test-subprocess 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>
This commit is contained in:
parent
b618821306
commit
112edd6abe
2
Makefile
2
Makefile
|
@ -683,6 +683,7 @@ TEST_BUILTINS_OBJS += test-sigchain.o
|
|||
TEST_BUILTINS_OBJS += test-strcmp-offset.o
|
||||
TEST_BUILTINS_OBJS += test-string-list.o
|
||||
TEST_BUILTINS_OBJS += test-submodule-config.o
|
||||
TEST_BUILTINS_OBJS += test-subprocess.o
|
||||
|
||||
TEST_PROGRAMS_NEED_X += test-dump-fsmonitor
|
||||
TEST_PROGRAMS_NEED_X += test-dump-untracked-cache
|
||||
|
@ -690,7 +691,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-subprocess
|
||||
TEST_PROGRAMS_NEED_X += test-svn-fe
|
||||
TEST_PROGRAMS_NEED_X += test-tool
|
||||
TEST_PROGRAMS_NEED_X += test-urlmatch-normalization
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
#include "test-tool.h"
|
||||
#include "cache.h"
|
||||
#include "run-command.h"
|
||||
|
||||
int cmd_main(int argc, const char **argv)
|
||||
int cmd__subprocess(int argc, const char **argv)
|
||||
{
|
||||
struct child_process cp = CHILD_PROCESS_INIT;
|
||||
int nogit = 0;
|
||||
|
|
|
@ -38,6 +38,7 @@ static struct test_cmd cmds[] = {
|
|||
{ "strcmp-offset", cmd__strcmp_offset },
|
||||
{ "string-list", cmd__string_list },
|
||||
{ "submodule-config", cmd__submodule_config },
|
||||
{ "subprocess", cmd__subprocess },
|
||||
};
|
||||
|
||||
int cmd_main(int argc, const char **argv)
|
||||
|
|
|
@ -32,5 +32,6 @@ int cmd__sigchain(int argc, const char **argv);
|
|||
int cmd__strcmp_offset(int argc, const char **argv);
|
||||
int cmd__string_list(int argc, const char **argv);
|
||||
int cmd__submodule_config(int argc, const char **argv);
|
||||
int cmd__subprocess(int argc, const char **argv);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -341,7 +341,7 @@ test_expect_success 'make_relative_path handles double slashes in GIT_DIR' '
|
|||
|
||||
test_expect_success 'relative $GIT_WORK_TREE and git subprocesses' '
|
||||
GIT_DIR=repo.git GIT_WORK_TREE=repo.git/work \
|
||||
test-subprocess --setup-work-tree rev-parse --show-toplevel >actual &&
|
||||
test-tool subprocess --setup-work-tree rev-parse --show-toplevel >actual &&
|
||||
echo "$(pwd)/repo.git/work" >expected &&
|
||||
test_cmp expected actual
|
||||
'
|
||||
|
|
Loading…
Reference in a new issue