mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'nd/test-helpers'
Sources to many test helper binaries (and the generated helpers) have been moved to t/helper/ subdirectory to reduce clutter at the top level of the tree. * nd/test-helpers: test helpers: move test-* to t/helper/ subdirectory Makefile: clean *.o files we create
This commit is contained in:
commit
e0b5851907
33
.gitignore
vendored
33
.gitignore
vendored
|
@ -179,39 +179,6 @@
|
||||||
/gitweb/gitweb.cgi
|
/gitweb/gitweb.cgi
|
||||||
/gitweb/static/gitweb.js
|
/gitweb/static/gitweb.js
|
||||||
/gitweb/static/gitweb.min.*
|
/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
|
/common-cmds.h
|
||||||
*.tar.gz
|
*.tar.gz
|
||||||
*.dsc
|
*.dsc
|
||||||
|
|
28
Makefile
28
Makefile
|
@ -621,7 +621,7 @@ TEST_PROGRAMS_NEED_X += test-svn-fe
|
||||||
TEST_PROGRAMS_NEED_X += test-urlmatch-normalization
|
TEST_PROGRAMS_NEED_X += test-urlmatch-normalization
|
||||||
TEST_PROGRAMS_NEED_X += test-wildmatch
|
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
|
# 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.
|
# builtin/$C.o but is linked in as part of some other command.
|
||||||
|
@ -1898,7 +1898,7 @@ VCSSVN_OBJS += vcs-svn/fast_export.o
|
||||||
VCSSVN_OBJS += vcs-svn/svndiff.o
|
VCSSVN_OBJS += vcs-svn/svndiff.o
|
||||||
VCSSVN_OBJS += vcs-svn/svndump.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) \
|
OBJECTS := $(LIB_OBJS) $(BUILTIN_OBJS) $(PROGRAM_OBJS) $(TEST_OBJS) \
|
||||||
$(XDIFF_OBJS) \
|
$(XDIFF_OBJS) \
|
||||||
$(VCSSVN_OBJS) \
|
$(VCSSVN_OBJS) \
|
||||||
|
@ -2205,7 +2205,7 @@ bin-wrappers/%: wrap-for-bin.sh
|
||||||
@mkdir -p bin-wrappers
|
@mkdir -p bin-wrappers
|
||||||
$(QUIET_GEN)sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
|
$(QUIET_GEN)sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
|
||||||
-e 's|@@BUILD_DIR@@|$(shell pwd)|' \
|
-e 's|@@BUILD_DIR@@|$(shell pwd)|' \
|
||||||
-e 's|@@PROG@@|$(@F)|' < $< > $@ && \
|
-e 's|@@PROG@@|$(patsubst test-%,t/helper/test-%,$(@F))|' < $< > $@ && \
|
||||||
chmod +x $@
|
chmod +x $@
|
||||||
|
|
||||||
# GNU make supports exporting all variables by "export" without parameters.
|
# GNU make supports exporting all variables by "export" without parameters.
|
||||||
|
@ -2225,25 +2225,25 @@ perf: all
|
||||||
|
|
||||||
.PHONY: test perf
|
.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)
|
.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)
|
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(filter %.a,$^) $(LIBS)
|
||||||
|
|
||||||
check-sha1:: test-sha1$X
|
check-sha1:: t/helper/test-sha1$X
|
||||||
./test-sha1.sh
|
t/helper/test-sha1.sh
|
||||||
|
|
||||||
SP_OBJ = $(patsubst %.o,%.sp,$(C_OBJ))
|
SP_OBJ = $(patsubst %.o,%.sp,$(C_OBJ))
|
||||||
|
|
||||||
|
@ -2450,8 +2450,8 @@ profile-clean:
|
||||||
$(RM) $(addsuffix *.gcno,$(addprefix $(PROFILE_DIR)/, $(object_dirs)))
|
$(RM) $(addsuffix *.gcno,$(addprefix $(PROFILE_DIR)/, $(object_dirs)))
|
||||||
|
|
||||||
clean: profile-clean coverage-clean
|
clean: profile-clean coverage-clean
|
||||||
$(RM) *.o *.res refs/*.o block-sha1/*.o ppc/*.o compat/*.o compat/*/*.o
|
$(RM) *.res
|
||||||
$(RM) xdiff/*.o vcs-svn/*.o ewah/*.o builtin/*.o
|
$(RM) $(OBJECTS)
|
||||||
$(RM) $(LIB_FILE) $(XDIFF_LIB) $(VCSSVN_LIB)
|
$(RM) $(LIB_FILE) $(XDIFF_LIB) $(VCSSVN_LIB)
|
||||||
$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X
|
$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X
|
||||||
$(RM) $(TEST_PROGRAMS) $(NO_INSTALL)
|
$(RM) $(TEST_PROGRAMS) $(NO_INSTALL)
|
||||||
|
|
33
t/helper/.gitignore
vendored
Normal file
33
t/helper/.gitignore
vendored
Normal file
|
@ -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
|
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
dd if=/dev/zero bs=1048576 count=100 2>/dev/null |
|
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
|
while read expect cnt pfx
|
||||||
do
|
do
|
||||||
|
@ -11,7 +11,7 @@ do
|
||||||
test -z "$pfx" || echo "$pfx"
|
test -z "$pfx" || echo "$pfx"
|
||||||
dd if=/dev/zero bs=1048576 count=$cnt 2>/dev/null |
|
dd if=/dev/zero bs=1048576 count=$cnt 2>/dev/null |
|
||||||
perl -pe 'y/\000/g/'
|
perl -pe 'y/\000/g/'
|
||||||
} | ./test-sha1 $cnt
|
} | ./t/helper/test-sha1 $cnt
|
||||||
)
|
)
|
||||||
if test "$expect" = "$actual"
|
if test "$expect" = "$actual"
|
||||||
then
|
then
|
|
@ -308,7 +308,7 @@ test_expect_success 'clone checking out a tag' '
|
||||||
|
|
||||||
setup_ssh_wrapper () {
|
setup_ssh_wrapper () {
|
||||||
test_expect_success '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" &&
|
"$TRASH_DIRECTORY/ssh-wrapper$X" &&
|
||||||
GIT_SSH="$TRASH_DIRECTORY/ssh-wrapper$X" &&
|
GIT_SSH="$TRASH_DIRECTORY/ssh-wrapper$X" &&
|
||||||
export GIT_SSH &&
|
export GIT_SSH &&
|
||||||
|
|
|
@ -854,10 +854,10 @@ test -d "$GIT_BUILD_DIR"/templates/blt || {
|
||||||
error "You haven't built things yet, have you?"
|
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
|
then
|
||||||
echo >&2 'You need to build test-chmtime:'
|
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
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue