Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t/helper: merge test-subprocess into test-tool
author
Nguyễn Thái Ngọc Duy
<pclouds@gmail.com>
Sat, 24 Mar 2018 07:45:02 +0000
(08:45 +0100)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 27 Mar 2018 15:45:47 +0000
(08:45 -0700)
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Makefile
patch
|
blob
|
history
t/helper/test-subprocess.c
patch
|
blob
|
history
t/helper/test-tool.c
patch
|
blob
|
history
t/helper/test-tool.h
patch
|
blob
|
history
t/t1501-work-tree.sh
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
b618821
)
diff --git
a/Makefile
b/Makefile
index c1dc9ff8d65718893d5b7240023788c845fcbb4c..893ea64ca2ca05302a013c73a81cb78a9023963c 100644
(file)
--- a/
Makefile
+++ b/
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-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
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-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
TEST_PROGRAMS_NEED_X += test-svn-fe
TEST_PROGRAMS_NEED_X += test-tool
TEST_PROGRAMS_NEED_X += test-urlmatch-normalization
diff --git
a/t/helper/test-subprocess.c
b/t/helper/test-subprocess.c
index 30c5765bfc3590421c21bc2350eed882752de3a0..92b69de635296d32d38d1f7d7589d5f8b6fbc296 100644
(file)
--- a/
t/helper/test-subprocess.c
+++ b/
t/helper/test-subprocess.c
@@
-1,7
+1,8
@@
+#include "test-tool.h"
#include "cache.h"
#include "run-command.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;
{
struct child_process cp = CHILD_PROCESS_INIT;
int nogit = 0;
diff --git
a/t/helper/test-tool.c
b/t/helper/test-tool.c
index 36b441a113d87878d91f00501c90cce74524f79f..d10fad111d6ba29506089fa5eae0dfaecb439164 100644
(file)
--- a/
t/helper/test-tool.c
+++ b/
t/helper/test-tool.c
@@
-38,6
+38,7
@@
static struct test_cmd cmds[] = {
{ "strcmp-offset", cmd__strcmp_offset },
{ "string-list", cmd__string_list },
{ "submodule-config", cmd__submodule_config },
{ "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)
};
int cmd_main(int argc, const char **argv)
diff --git
a/t/helper/test-tool.h
b/t/helper/test-tool.h
index be7e79738f5caa334a9c5af3f37a5860b9cacda0..a61180106181069860c5cf84650142c7fbd4a490 100644
(file)
--- a/
t/helper/test-tool.h
+++ b/
t/helper/test-tool.h
@@
-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__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
#endif
diff --git
a/t/t1501-work-tree.sh
b/t/t1501-work-tree.sh
index b07cb9140e1b1fe1df0c08eea487bbf5916fe31d..02cf2013fc6f68cdb62739e9dff94fa08f5607be 100755
(executable)
--- a/
t/t1501-work-tree.sh
+++ b/
t/t1501-work-tree.sh
@@
-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_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
'
echo "$(pwd)/repo.git/work" >expected &&
test_cmp expected actual
'