diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-01-29 14:19:37 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-29 17:26:47 (GMT) |
| commit | dd167a3001a18ca1e9bcb607dfbdffbfe5af2113 (patch) | |
| tree | e7c0d72fe0b52b108daaec41b7f5b8dfe39f30a1 /t/test-lib.sh | |
| parent | 06718d4a1e46486a80a887e259e9b2eada2c309d (diff) | |
| download | git-dd167a3001a18ca1e9bcb607dfbdffbfe5af2113.zip git-dd167a3001a18ca1e9bcb607dfbdffbfe5af2113.tar.gz git-dd167a3001a18ca1e9bcb607dfbdffbfe5af2113.tar.bz2 | |
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>
Diffstat (limited to 't/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index c790e98..25e649c 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -111,6 +111,8 @@ do test -z "$HARNESS_ACTIVE" && quiet=t ;; --with-dashes) with_dashes=t ;; + --no-bin-wrappers) + no_bin_wrappers=t ;; --no-color) color= ;; --va|--val|--valg|--valgr|--valgri|--valgrin|--valgrind) @@ -1214,16 +1216,21 @@ then PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR/t/helper:$PATH GIT_EXEC_PATH=${GIT_TEST_EXEC_PATH:-$GIT_EXEC_PATH} else # normal case, use ../bin-wrappers only unless $with_dashes: - git_bin_dir="$GIT_BUILD_DIR/bin-wrappers" - if ! test -x "$git_bin_dir/git" + if test -n "$no_bin_wrappers" then - if test -z "$with_dashes" + with_dashes=t + else + git_bin_dir="$GIT_BUILD_DIR/bin-wrappers" + if ! test -x "$git_bin_dir/git" then - say "$git_bin_dir/git is not executable; using GIT_EXEC_PATH" + if test -z "$with_dashes" + then + say "$git_bin_dir/git is not executable; using GIT_EXEC_PATH" + fi + with_dashes=t fi - with_dashes=t + PATH="$git_bin_dir:$PATH" fi - PATH="$git_bin_dir:$PATH" GIT_EXEC_PATH=$GIT_BUILD_DIR if test -n "$with_dashes" then |