admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GIT-BUILD-OPTIONS: wire up NO_GITWEB option

Browse Source 
Building our "gitweb" interface is optional in our Makefile and in Meson
and not wired up at all with CMake, but disabling it causes a couple of
tests in the t950* range that pull in "t/lib-gitweb.sh". This is because
the test library knows to execute gitweb-tests based on whether or not
Perl is available, but we may have Perl available and still end up not
building gitweb e.g. with `make test NO_GITWEB=YesPlease`.

Fix this issue by wiring up a new "NO_GITWEB" build option so that we
can skip these tests in case gitweb is not built.

Note that this new build option requires us to move the configuration of
GIT-BUILD-OPTIONS to a later point in our Meson build instructions. But
as that file is only consumed by our tests at runtime this change does
not cause any issues.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2024-12-27 13:10:18 +01:00
committed by Junio C Hamano
parent cfa1f2ae96
commit cbcc2f7911
6 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
t/lib-gitweb.sh
View File

@@ -105,6 +105,11 @@ if ! test_have_prereq PERL; then
test_done
fi
if ! test_have_prereq GITWEB; then
skip_all='skipping gitweb tests, gitweb not available'
test_done
fi
perl -MEncode -e '$e="";decode_utf8($e, Encode::FB_CROAK)' >/dev/null 2>&1 || {
skip_all='skipping gitweb tests, perl version is too old'
test_done