kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

tests: optionally skip bin-wrappers/ 

This speeds up the tests by a bit on Windows, where running Unix shell
scripts (and spawning processes) is not exactly a cheap operation.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Johannes Schindelin 2019-01-29 06:19:37 -08:00 committed by Junio C Hamano
parent 06718d4a1e
commit dd167a3001
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
t/README
View File

@ -170,6 +170,15 @@ appropriately before running "make".
implied by other options like --valgrind and implied by other options like --valgrind and
GIT_TEST_INSTALLED. GIT_TEST_INSTALLED.


--no-bin-wrappers::
By default, the test suite uses the wrappers in
`../bin-wrappers/` to execute `git` and friends. With this option,
`../git` and friends are run directly. This is not recommended
in general, as the wrappers contain safeguards to ensure that no
files from an installed Git are used, but can speed up test runs
especially on platforms where running shell scripts is expensive
(most notably, Windows).

--root=<directory>:: --root=<directory>::
Create "trash" directories used to store all temporary data during Create "trash" directories used to store all temporary data during
testing under <directory>, instead of the t/ directory. testing under <directory>, instead of the t/ directory.

21
t/test-lib.sh
View File

@ -111,6 +111,8 @@ do
test -z "$HARNESS_ACTIVE" && quiet=t ;; test -z "$HARNESS_ACTIVE" && quiet=t ;;
--with-dashes) --with-dashes)
with_dashes=t ;; with_dashes=t ;;
--no-bin-wrappers)
no_bin_wrappers=t ;;
--no-color) --no-color)
color= ;; color= ;;
--va|--val|--valg|--valgr|--valgri|--valgrin|--valgrind) --va|--val|--valg|--valgr|--valgri|--valgrin|--valgrind)
@ -1214,16 +1216,21 @@ then
PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR/t/helper:$PATH PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR/t/helper:$PATH
GIT_EXEC_PATH=${GIT_TEST_EXEC_PATH:-$GIT_EXEC_PATH} GIT_EXEC_PATH=${GIT_TEST_EXEC_PATH:-$GIT_EXEC_PATH}
else # normal case, use ../bin-wrappers only unless $with_dashes: else # normal case, use ../bin-wrappers only unless $with_dashes:
git_bin_dir="$GIT_BUILD_DIR/bin-wrappers" if test -n "$no_bin_wrappers"
if ! test -x "$git_bin_dir/git"
then then
if test -z "$with_dashes"
then
say "$git_bin_dir/git is not executable; using GIT_EXEC_PATH"
fi
with_dashes=t with_dashes=t
else
git_bin_dir="$GIT_BUILD_DIR/bin-wrappers"
if ! test -x "$git_bin_dir/git"
then
if test -z "$with_dashes"
then
say "$git_bin_dir/git is not executable; using GIT_EXEC_PATH"
fi
with_dashes=t
fi
PATH="$git_bin_dir:$PATH"
fi fi
PATH="$git_bin_dir:$PATH"
GIT_EXEC_PATH=$GIT_BUILD_DIR GIT_EXEC_PATH=$GIT_BUILD_DIR
if test -n "$with_dashes" if test -n "$with_dashes"
then then