diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-12-10 03:37:48 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-12-10 03:37:48 +0300 |
| commit | 14a4445d18eccc146b3340c2bdeeb15c81538938 (patch) | |
| tree | eef5fec80766a065a5e4e4790803937812925e99 /t/lib-httpd.sh | |
| parent | 712177ed04c3c33bfe6075b9cc2d4d65e2cc04c2 (diff) | |
| parent | 0e3b67e2aa25edb7e1a5c999c87b52a7b3a7649a (diff) | |
Merge branch 'ps/ci-gitlab'
Add support for GitLab CI.
* ps/ci-gitlab:
ci: add support for GitLab CI
ci: install test dependencies for linux-musl
ci: squelch warnings when testing with unusable Git repo
ci: unify setup of some environment variables
ci: split out logic to set up failed test artifacts
ci: group installation of Docker dependencies
ci: make grouping setup more generic
ci: reorder definitions for grouping functions
Diffstat (limited to 't/lib-httpd.sh')
| -rw-r--r-- | t/lib-httpd.sh | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh index 03493ee72b..d83bafeab3 100644 --- a/t/lib-httpd.sh +++ b/t/lib-httpd.sh @@ -76,6 +76,7 @@ for DEFAULT_HTTPD_MODULE_PATH in '/usr/libexec/apache2' \ '/usr/lib64/httpd/modules' \ '/usr/lib/httpd/modules' \ '/usr/libexec/httpd' \ + '/usr/lib/apache2' \ "${DETECTED_HTTPD_ROOT:+${DETECTED_HTTPD_ROOT}/modules}" do if test -n "$DEFAULT_HTTPD_MODULE_PATH" && test -d "$DEFAULT_HTTPD_MODULE_PATH" @@ -136,6 +137,20 @@ else "Could not identify web server at '$LIB_HTTPD_PATH'" fi +if test -n "$LIB_HTTPD_DAV" && test -f /etc/os-release +then + case "$(grep "^ID=" /etc/os-release | cut -d= -f2-)" in + alpine) + # The WebDAV module in Alpine Linux is broken at least up to + # Alpine v3.16 as the default DBM driver is missing. + # + # https://gitlab.alpinelinux.org/alpine/aports/-/issues/13112 + test_skip_or_die GIT_TEST_HTTPD \ + "Apache WebDAV module does not have default DBM backend driver" + ;; + esac +fi + install_script () { write_script "$HTTPD_ROOT_PATH/$1" <"$TEST_PATH/$1" } |