Re: [PATCH v2 3/3] ci: stop linking built-ins to the dashed versions
Junio C Hamano <gitster@pobox.com> writes:
Show 13 quoted lines
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
>> Actually, `SKIP_DASHED_BUILT_INS` does not _only_ have an impact on `make
>> install`:
>> ...
>> See how `git-add.exe` is linked in the first, but not in the second run?
>
> OK, that is one more reason why we do want to have 3/3 applied not
> for all tasks in the CI , but for subset of tasks that includes the
> Windows task. If we had multiple Windows tasks, it may even be
> better to have only to some tasks, and allow other tasks build
> git-add.exe, so that both can be tested for the primary intended
> platform.
In other words, something like this squashed in.
ci/run-build-and-tests.sh | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
index 1df9402c3b..cfb841d981 100755
--- a/ci/run-build-and-tests.sh
+++ b/ci/run-build-and-tests.sh
@@ -5,12 +5,16 @@
. ${0%/*}/lib.sh
+BUILTINS_HOW=
case "$CI_OS_NAME" in
-windows*) cmd //c mklink //j t\\.prove "$(cygpath -aw "$cache_dir/.prove")";;
-*) ln -s "$cache_dir/.prove" t/.prove;;
+windows*)
+ BUILTINS_HOW=SKIP_DASHED_BUILT_INS=YesPlease
+ cmd //c mklink //j t\\.prove "$(cygpath -aw "$cache_dir/.prove")";;
+*)
+ ln -s "$cache_dir/.prove" t/.prove;;
esac
-make SKIP_DASHED_BUILT_INS=YesPlease
+make $BUILTINS_HOW
case "$jobname" in
linux-gcc)
make test
Junio C Hamano <gitster@pobox.com>