Signed-off-by: Nguyán ThÃi Ngác Duy <pclouds@xxxxxxxxx> --- .gitignore | 19 ------------ Makefile | 30 ++++++++++---------- t/helper/.gitignore | 19 ++++++++++++ test-chmtime.c => t/helper/test-chmtime.c | 0 test-ctype.c => t/helper/test-ctype.c | 0 test-date.c => t/helper/test-date.c | 0 test-delta.c => t/helper/test-delta.c | 0 .../helper/test-dump-cache-tree.c | 0 test-genrandom.c => t/helper/test-genrandom.c | 0 .../helper/test-index-version.c | 0 test-line-buffer.c => t/helper/test-line-buffer.c | 0 test-match-trees.c => t/helper/test-match-trees.c | 0 test-obj-pool.c => t/helper/test-obj-pool.c | 0 .../helper/test-parse-options.c | 0 test-path-utils.c => t/helper/test-path-utils.c | 0 test-run-command.c => t/helper/test-run-command.c | 0 test-sha1.c => t/helper/test-sha1.c | 0 test-sha1.sh => t/helper/test-sha1.sh | 4 +- test-sigchain.c => t/helper/test-sigchain.c | 0 test-string-pool.c => t/helper/test-string-pool.c | 0 test-subprocess.c => t/helper/test-subprocess.c | 0 test-svn-fe.c => t/helper/test-svn-fe.c | 0 test-treap.c => t/helper/test-treap.c | 0 t/test-lib.sh | 4 +- 24 files changed, 38 insertions(+), 38 deletions(-) create mode 100644 t/helper/.gitignore rename test-chmtime.c => t/helper/test-chmtime.c (100%) rename test-ctype.c => t/helper/test-ctype.c (100%) rename test-date.c => t/helper/test-date.c (100%) rename test-delta.c => t/helper/test-delta.c (100%) rename test-dump-cache-tree.c => t/helper/test-dump-cache-tree.c (100%) rename test-genrandom.c => t/helper/test-genrandom.c (100%) rename test-index-version.c => t/helper/test-index-version.c (100%) rename test-line-buffer.c => t/helper/test-line-buffer.c (100%) rename test-match-trees.c => t/helper/test-match-trees.c (100%) rename test-obj-pool.c => t/helper/test-obj-pool.c (100%) rename test-parse-options.c => t/helper/test-parse-options.c (100%) rename test-path-utils.c => t/helper/test-path-utils.c (100%) rename test-run-command.c => t/helper/test-run-command.c (100%) rename test-sha1.c => t/helper/test-sha1.c (100%) rename test-sha1.sh => t/helper/test-sha1.sh (96%) rename test-sigchain.c => t/helper/test-sigchain.c (100%) rename test-string-pool.c => t/helper/test-string-pool.c (100%) rename test-subprocess.c => t/helper/test-subprocess.c (100%) rename test-svn-fe.c => t/helper/test-svn-fe.c (100%) rename test-treap.c => t/helper/test-treap.c (100%) diff --git a/.gitignore b/.gitignore index 3dd6ef7..a99a216 100644 --- a/.gitignore +++ b/.gitignore @@ -161,25 +161,6 @@ /gitweb/GITWEB-BUILD-OPTIONS /gitweb/gitweb.cgi /gitweb/static/gitweb.min.* -/test-chmtime -/test-ctype -/test-date -/test-delta -/test-dump-cache-tree -/test-genrandom -/test-index-version -/test-line-buffer -/test-match-trees -/test-obj-pool -/test-parse-options -/test-path-utils -/test-run-command -/test-sha1 -/test-sigchain -/test-string-pool -/test-subprocess -/test-svn-fe -/test-treap /common-cmds.h *.tar.gz *.dsc diff --git a/Makefile b/Makefile index 775ee83..e2b3b92 100644 --- a/Makefile +++ b/Makefile @@ -436,7 +436,7 @@ TEST_PROGRAMS_NEED_X += test-svn-fe TEST_PROGRAMS_NEED_X += test-treap TEST_PROGRAMS_NEED_X += test-index-version -TEST_PROGRAMS = $(patsubst %,%$X,$(TEST_PROGRAMS_NEED_X)) +TEST_PROGRAMS = $(patsubst %,t/helper/%$X,$(TEST_PROGRAMS_NEED_X)) # List built-in command $C whose implementation cmd_$C() is not in # builtin/$C.o but is linked in as part of some other command. @@ -1829,7 +1829,7 @@ git.o git.spec \ $(patsubst %.perl,%,$(SCRIPT_PERL)) \ : GIT-VERSION-FILE -TEST_OBJS := $(patsubst test-%$X,test-%.o,$(TEST_PROGRAMS)) +TEST_OBJS := $(patsubst %$X,%.o,$(TEST_PROGRAMS)) GIT_OBJS := $(LIB_OBJS) $(BUILTIN_OBJS) $(PROGRAM_OBJS) $(TEST_OBJS) \ git.o ifndef NO_CURL @@ -1963,12 +1963,12 @@ xdiff-interface.o $(XDIFF_OBJS): \ xdiff/xinclude.h xdiff/xmacros.h xdiff/xdiff.h xdiff/xtypes.h \ xdiff/xutils.h xdiff/xprepare.h xdiff/xdiffi.h xdiff/xemit.h -$(VCSSVN_OBJS) $(VCSSVN_TEST_OBJS): $(LIB_H) \ +$(VCSSVN_OBJS) $(patsubst %,t/helper/%,$(VCSSVN_TEST_OBJS)): $(LIB_H) \ vcs-svn/obj_pool.h vcs-svn/trp.h vcs-svn/string_pool.h \ vcs-svn/line_buffer.h vcs-svn/repo_tree.h vcs-svn/fast_export.h \ vcs-svn/svndump.h -test-svn-fe.o: vcs-svn/svndump.h +t/helper/test-svn-fe.o: vcs-svn/svndump.h endif exec_cmd.s exec_cmd.o: EXTRA_CPPFLAGS = \ @@ -2108,7 +2108,7 @@ bin-wrappers/%: wrap-for-bin.sh @mkdir -p bin-wrappers $(QUIET_GEN)sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ -e 's|@@BUILD_DIR@@|$(shell pwd)|' \ - -e 's|@@PROG@@|$(@F)|' < $< > $@ && \ + -e 's|@@PROG@@|$(patsubst test-%,t/helper/test-%,$(@F))|' < $< > $@ && \ chmod +x $@ # GNU make supports exporting all variables by "export" without parameters. @@ -2122,27 +2122,27 @@ export NO_SVN_TESTS test: all $(MAKE) -C t/ all -test-ctype$X: ctype.o +t/helper/test-ctype$X: ctype.o -test-date$X: date.o ctype.o +t/helper/test-date$X: date.o ctype.o -test-delta$X: diff-delta.o patch-delta.o +t/helper/test-delta$X: diff-delta.o patch-delta.o -test-line-buffer$X: vcs-svn/lib.a +t/helper/test-line-buffer$X: vcs-svn/lib.a -test-parse-options$X: parse-options.o +t/helper/test-parse-options$X: parse-options.o -test-string-pool$X: vcs-svn/lib.a +t/helper/test-string-pool$X: vcs-svn/lib.a -test-svn-fe$X: vcs-svn/lib.a +t/helper/test-svn-fe$X: vcs-svn/lib.a .PRECIOUS: $(TEST_OBJS) -test-%$X: test-%.o $(GITLIBS) +t/helper/test-%$X: t/helper/test-%.o $(GITLIBS) $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(filter %.a,$^) $(LIBS) -check-sha1:: test-sha1$X - ./test-sha1.sh +check-sha1:: t/helper/test-sha1$X + t/helper/test-sha1.sh check: common-cmds.h if sparse; \ diff --git a/t/helper/.gitignore b/t/helper/.gitignore new file mode 100644 index 0000000..8f1b042 --- /dev/null +++ b/t/helper/.gitignore @@ -0,0 +1,19 @@ +/test-chmtime +/test-ctype +/test-date +/test-delta +/test-dump-cache-tree +/test-genrandom +/test-index-version +/test-line-buffer +/test-match-trees +/test-obj-pool +/test-parse-options +/test-path-utils +/test-run-command +/test-sha1 +/test-sigchain +/test-string-pool +/test-subprocess +/test-svn-fe +/test-treap diff --git a/test-chmtime.c b/t/helper/test-chmtime.c similarity index 100% rename from test-chmtime.c rename to t/helper/test-chmtime.c diff --git a/test-ctype.c b/t/helper/test-ctype.c similarity index 100% rename from test-ctype.c rename to t/helper/test-ctype.c diff --git a/test-date.c b/t/helper/test-date.c similarity index 100% rename from test-date.c rename to t/helper/test-date.c diff --git a/test-delta.c b/t/helper/test-delta.c similarity index 100% rename from test-delta.c rename to t/helper/test-delta.c diff --git a/test-dump-cache-tree.c b/t/helper/test-dump-cache-tree.c similarity index 100% rename from test-dump-cache-tree.c rename to t/helper/test-dump-cache-tree.c diff --git a/test-genrandom.c b/t/helper/test-genrandom.c similarity index 100% rename from test-genrandom.c rename to t/helper/test-genrandom.c diff --git a/test-index-version.c b/t/helper/test-index-version.c similarity index 100% rename from test-index-version.c rename to t/helper/test-index-version.c diff --git a/test-line-buffer.c b/t/helper/test-line-buffer.c similarity index 100% rename from test-line-buffer.c rename to t/helper/test-line-buffer.c diff --git a/test-match-trees.c b/t/helper/test-match-trees.c similarity index 100% rename from test-match-trees.c rename to t/helper/test-match-trees.c diff --git a/test-obj-pool.c b/t/helper/test-obj-pool.c similarity index 100% rename from test-obj-pool.c rename to t/helper/test-obj-pool.c diff --git a/test-parse-options.c b/t/helper/test-parse-options.c similarity index 100% rename from test-parse-options.c rename to t/helper/test-parse-options.c diff --git a/test-path-utils.c b/t/helper/test-path-utils.c similarity index 100% rename from test-path-utils.c rename to t/helper/test-path-utils.c diff --git a/test-run-command.c b/t/helper/test-run-command.c similarity index 100% rename from test-run-command.c rename to t/helper/test-run-command.c diff --git a/test-sha1.c b/t/helper/test-sha1.c similarity index 100% rename from test-sha1.c rename to t/helper/test-sha1.c diff --git a/test-sha1.sh b/t/helper/test-sha1.sh similarity index 96% rename from test-sha1.sh rename to t/helper/test-sha1.sh index 0f0bc5d..4e691d1 100755 --- a/test-sha1.sh +++ b/t/helper/test-sha1.sh @@ -1,7 +1,7 @@ #!/bin/sh dd if=/dev/zero bs=1048576 count=100 2>/dev/null | -/usr/bin/time ./test-sha1 >/dev/null +/usr/bin/time t/helper/test-sha1 >/dev/null while read expect cnt pfx do @@ -11,7 +11,7 @@ do test -z "$pfx" || echo "$pfx" dd if=/dev/zero bs=1048576 count=$cnt 2>/dev/null | perl -pe 'y/\000/g/' - } | ./test-sha1 $cnt + } | t/helper/test-sha1 $cnt ` if test "$expect" = "$actual" then diff --git a/test-sigchain.c b/t/helper/test-sigchain.c similarity index 100% rename from test-sigchain.c rename to t/helper/test-sigchain.c diff --git a/test-string-pool.c b/t/helper/test-string-pool.c similarity index 100% rename from test-string-pool.c rename to t/helper/test-string-pool.c diff --git a/test-subprocess.c b/t/helper/test-subprocess.c similarity index 100% rename from test-subprocess.c rename to t/helper/test-subprocess.c diff --git a/test-svn-fe.c b/t/helper/test-svn-fe.c similarity index 100% rename from test-svn-fe.c rename to t/helper/test-svn-fe.c diff --git a/test-treap.c b/t/helper/test-treap.c similarity index 100% rename from test-treap.c rename to t/helper/test-treap.c diff --git a/t/test-lib.sh b/t/test-lib.sh index 0fdc541..eebf7a8 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -984,9 +984,9 @@ then } fi -if ! test -x "$GIT_BUILD_DIR"/test-chmtime; then +if ! test -x "$GIT_BUILD_DIR"/t/helper/test-chmtime; then echo >&2 'You need to build test-chmtime:' - echo >&2 'Run "make test-chmtime" in the source (toplevel) directory' + echo >&2 'Run "make t/helper/test-chmtime" in the source (toplevel) directory' exit 1 fi -- 1.7.4.74.g639db -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html