File tree Expand file tree Collapse file tree 2 files changed +22
-6
lines changed Expand file tree Collapse file tree 2 files changed +22
-6
lines changed Original file line number Diff line number Diff line change @@ -169,6 +169,15 @@ appropriately before running "make".
169
169
implied by other options like --valgrind and
170
170
GIT_TEST_INSTALLED.
171
171
172
+ --no-bin-wrappers::
173
+ By default, the test suite uses the wrappers in
174
+ `../bin-wrappers/` to execute `git` and friends. With this option,
175
+ `../git` and friends are run directly. This is not recommended
176
+ in general, as the wrappers contain safeguards to ensure that no
177
+ files from an installed Git are used, but can speed up test runs
178
+ especially on platforms where running shell scripts is expensive
179
+ (most notably, Windows).
180
+
172
181
--root=<directory>::
173
182
Create "trash" directories used to store all temporary data during
174
183
testing under <directory>, instead of the t/ directory.
Original file line number Diff line number Diff line change 259
259
test -z " $HARNESS_ACTIVE " && quiet=t; shift ;;
260
260
--with-dashes)
261
261
with_dashes=t; shift ;;
262
+ --no-bin-wrappers)
263
+ no_bin_wrappers=t; shift ;;
262
264
--no-color)
263
265
color=; shift ;;
264
266
--va|--val|--valg|--valgr|--valgri|--valgrin|--valgrind)
@@ -1069,16 +1071,21 @@ then
1069
1071
PATH=$GIT_TEST_INSTALLED$PATH_SEP$GIT_BUILD_DIR /t/helper$PATH_SEP$PATH
1070
1072
GIT_EXEC_PATH=${GIT_TEST_EXEC_PATH:- $GIT_EXEC_PATH }
1071
1073
else # normal case, use ../bin-wrappers only unless $with_dashes:
1072
- git_bin_dir=" $GIT_BUILD_DIR /bin-wrappers"
1073
- if ! test -x " $git_bin_dir /git"
1074
+ if test -n " $no_bin_wrappers "
1074
1075
then
1075
- if test -z " $with_dashes "
1076
+ with_dashes=t
1077
+ else
1078
+ git_bin_dir=" $GIT_BUILD_DIR /bin-wrappers"
1079
+ if ! test -x " $git_bin_dir /git"
1076
1080
then
1077
- say " $git_bin_dir /git is not executable; using GIT_EXEC_PATH"
1081
+ if test -z " $with_dashes "
1082
+ then
1083
+ say " $git_bin_dir /git is not executable; using GIT_EXEC_PATH"
1084
+ fi
1085
+ with_dashes=t
1078
1086
fi
1079
- with_dashes=t
1087
+ PATH= " $git_bin_dir$PATH_SEP$PATH "
1080
1088
fi
1081
- PATH=" $git_bin_dir$PATH_SEP$PATH "
1082
1089
GIT_EXEC_PATH=$GIT_BUILD_DIR
1083
1090
if test -n " $with_dashes "
1084
1091
then
You can’t perform that action at this time.
0 commit comments