test helpers: move test-* to t/helper/ subdirectory

This keeps top dir a bit less crowded. And because these programs are for testing purposes, it makes sense that they stay somewhere in t/ Signed-off-by: Nguyễn Thái Ngọc Duy <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
johnnyg · Apr 15, 2016 · e6e7530 · e6e7530
1 parent 7897d84
commit e6e7530
Show file tree

Hide file tree

Showing 39 changed files with 50 additions and 50 deletions.
diff --git a/.gitignore b/.gitignore
@@ -179,39 +179,6 @@
 /gitweb/gitweb.cgi
 /gitweb/static/gitweb.js
 /gitweb/static/gitweb.min.*
-/test-chmtime
-/test-ctype
-/test-config
-/test-date
-/test-delta
-/test-dump-cache-tree
-/test-dump-split-index
-/test-dump-untracked-cache
-/test-fake-ssh
-/test-scrap-cache-tree
-/test-genrandom
-/test-hashmap
-/test-index-version
-/test-line-buffer
-/test-match-trees
-/test-mergesort
-/test-mktemp
-/test-parse-options
-/test-path-utils
-/test-prio-queue
-/test-read-cache
-/test-regex
-/test-revision-walking
-/test-run-command
-/test-sha1
-/test-sha1-array
-/test-sigchain
-/test-string-list
-/test-submodule-config
-/test-subprocess
-/test-svn-fe
-/test-urlmatch-normalization
-/test-wildmatch
 /common-cmds.h
 *.tar.gz
 *.dsc

diff --git a/Makefile b/Makefile
@@ -624,7 +624,7 @@ TEST_PROGRAMS_NEED_X += test-svn-fe
 TEST_PROGRAMS_NEED_X += test-urlmatch-normalization
 TEST_PROGRAMS_NEED_X += test-wildmatch
 
-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.
@@ -1904,7 +1904,7 @@ VCSSVN_OBJS += vcs-svn/fast_export.o
 VCSSVN_OBJS += vcs-svn/svndiff.o
 VCSSVN_OBJS += vcs-svn/svndump.o
 
-TEST_OBJS := $(patsubst test-%$X,test-%.o,$(TEST_PROGRAMS))
+TEST_OBJS := $(patsubst %$X,%.o,$(TEST_PROGRAMS))
 OBJECTS := $(LIB_OBJS) $(BUILTIN_OBJS) $(PROGRAM_OBJS) $(TEST_OBJS) \
 	$(XDIFF_OBJS) \
 	$(VCSSVN_OBJS) \
@@ -2211,7 +2211,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.
@@ -2231,25 +2231,25 @@ perf: all
 
 .PHONY: test perf
 
-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 parse-options-cb.o
+t/helper/test-parse-options$X: parse-options.o parse-options-cb.o
 
-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 GIT-LDFLAGS $(GITLIBS)
+t/helper/test-%$X: t/helper/test-%.o GIT-LDFLAGS $(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
 
 SP_OBJ = $(patsubst %.o,%.sp,$(C_OBJ))
 

diff --git a/t/helper/.gitignore b/t/helper/.gitignore
@@ -0,0 +1,33 @@
+/test-chmtime
+/test-ctype
+/test-config
+/test-date
+/test-delta
+/test-dump-cache-tree
+/test-dump-split-index
+/test-dump-untracked-cache
+/test-fake-ssh
+/test-scrap-cache-tree
+/test-genrandom
+/test-hashmap
+/test-index-version
+/test-line-buffer
+/test-match-trees
+/test-mergesort
+/test-mktemp
+/test-parse-options
+/test-path-utils
+/test-prio-queue
+/test-read-cache
+/test-regex
+/test-revision-walking
+/test-run-command
+/test-sha1
+/test-sha1-array
+/test-sigchain
+/test-string-list
+/test-submodule-config
+/test-subprocess
+/test-svn-fe
+/test-urlmatch-normalization
+/test-wildmatch
diff --git a/test-chmtime.c → t/helper/test-chmtime.c b/test-chmtime.c → t/helper/test-chmtime.c
diff --git a/test-config.c → t/helper/test-config.c b/test-config.c → t/helper/test-config.c
diff --git a/test-ctype.c → t/helper/test-ctype.c b/test-ctype.c → t/helper/test-ctype.c
diff --git a/test-date.c → t/helper/test-date.c b/test-date.c → t/helper/test-date.c
diff --git a/test-delta.c → t/helper/test-delta.c b/test-delta.c → t/helper/test-delta.c
diff --git a/test-dump-cache-tree.c → t/helper/test-dump-cache-tree.c b/test-dump-cache-tree.c → t/helper/test-dump-cache-tree.c
diff --git a/test-dump-split-index.c → t/helper/test-dump-split-index.c b/test-dump-split-index.c → t/helper/test-dump-split-index.c
diff --git a/test-dump-untracked-cache.c → t/helper/test-dump-untracked-cache.c b/test-dump-untracked-cache.c → t/helper/test-dump-untracked-cache.c
diff --git a/test-fake-ssh.c → t/helper/test-fake-ssh.c b/test-fake-ssh.c → t/helper/test-fake-ssh.c
diff --git a/test-genrandom.c → t/helper/test-genrandom.c b/test-genrandom.c → t/helper/test-genrandom.c
diff --git a/test-hashmap.c → t/helper/test-hashmap.c b/test-hashmap.c → t/helper/test-hashmap.c
diff --git a/test-index-version.c → t/helper/test-index-version.c b/test-index-version.c → t/helper/test-index-version.c
diff --git a/test-line-buffer.c → t/helper/test-line-buffer.c b/test-line-buffer.c → t/helper/test-line-buffer.c
diff --git a/test-match-trees.c → t/helper/test-match-trees.c b/test-match-trees.c → t/helper/test-match-trees.c
diff --git a/test-mergesort.c → t/helper/test-mergesort.c b/test-mergesort.c → t/helper/test-mergesort.c
diff --git a/test-mktemp.c → t/helper/test-mktemp.c b/test-mktemp.c → t/helper/test-mktemp.c
diff --git a/test-parse-options.c → t/helper/test-parse-options.c b/test-parse-options.c → t/helper/test-parse-options.c
diff --git a/test-path-utils.c → t/helper/test-path-utils.c b/test-path-utils.c → t/helper/test-path-utils.c
diff --git a/test-prio-queue.c → t/helper/test-prio-queue.c b/test-prio-queue.c → t/helper/test-prio-queue.c
diff --git a/test-read-cache.c → t/helper/test-read-cache.c b/test-read-cache.c → t/helper/test-read-cache.c
diff --git a/test-regex.c → t/helper/test-regex.c b/test-regex.c → t/helper/test-regex.c
diff --git a/test-revision-walking.c → t/helper/test-revision-walking.c b/test-revision-walking.c → t/helper/test-revision-walking.c
diff --git a/test-run-command.c → t/helper/test-run-command.c b/test-run-command.c → t/helper/test-run-command.c
diff --git a/test-scrap-cache-tree.c → t/helper/test-scrap-cache-tree.c b/test-scrap-cache-tree.c → t/helper/test-scrap-cache-tree.c
diff --git a/test-sha1-array.c → t/helper/test-sha1-array.c b/test-sha1-array.c → t/helper/test-sha1-array.c
diff --git a/test-sha1.c → t/helper/test-sha1.c b/test-sha1.c → t/helper/test-sha1.c
diff --git a/test-sha1.sh → t/helper/test-sha1.sh b/test-sha1.sh → 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 → t/helper/test-sigchain.c b/test-sigchain.c → t/helper/test-sigchain.c
diff --git a/test-string-list.c → t/helper/test-string-list.c b/test-string-list.c → t/helper/test-string-list.c
diff --git a/test-submodule-config.c → t/helper/test-submodule-config.c b/test-submodule-config.c → t/helper/test-submodule-config.c
diff --git a/test-subprocess.c → t/helper/test-subprocess.c b/test-subprocess.c → t/helper/test-subprocess.c
diff --git a/test-svn-fe.c → t/helper/test-svn-fe.c b/test-svn-fe.c → t/helper/test-svn-fe.c
diff --git a/test-urlmatch-normalization.c → t/helper/test-urlmatch-normalization.c b/test-urlmatch-normalization.c → t/helper/test-urlmatch-normalization.c
diff --git a/test-wildmatch.c → t/helper/test-wildmatch.c b/test-wildmatch.c → t/helper/test-wildmatch.c
diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
@@ -308,7 +308,7 @@ test_expect_success 'clone checking out a tag' '
 
 setup_ssh_wrapper () {
 	test_expect_success 'setup ssh wrapper' '
-		cp "$GIT_BUILD_DIR/test-fake-ssh$X" \
+		cp "$GIT_BUILD_DIR/t/helper/test-fake-ssh$X" \
 			"$TRASH_DIRECTORY/ssh-wrapper$X" &&
 		GIT_SSH="$TRASH_DIRECTORY/ssh-wrapper$X" &&
 		export GIT_SSH &&

diff --git a/t/test-lib.sh b/t/test-lib.sh
@@ -854,10 +854,10 @@ test -d "$GIT_BUILD_DIR"/templates/blt || {
 	error "You haven't built things yet, have you?"
 }
 
-if ! test -x "$GIT_BUILD_DIR"/test-chmtime
+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