Re: [PATCH v3 7/8] ci: install test dependencies for linux-musl
- From
- Phillip Wood <phillip.wood123@gmail.com>
- Date
- Oct 30, 2023, 16:09 UTC
- Message-ID
- <ba7a7a8c-bb0c-4f12-a7fa-d05b1c246d5f@gmail.com>
- In-Reply-To
- <ZT_KWjxkPEIXHEeH@tanuki>
On 30/10/2023 15:23, Patrick Steinhardt wrote:
Show 19 quoted lines
> On Mon, Oct 30, 2023 at 03:13:35PM +0000, Phillip Wood wrote: >> Hi Patrick >> >> On 30/10/2023 12:47, Patrick Steinhardt wrote: >>> On Mon, Oct 30, 2023 at 01:15:10PM +0100, Patrick Steinhardt wrote: >>> But once fixed, tests do indeed start to fail: >>> >>> t5540-http-push-webdav.sh (Wstat: 256 (exited 1) Tests: 20 Failed: 11) >>> Failed tests: 5-11, 13, 15-16, 18 >>> Non-zero exit status: 1 >>> >>> Seems like another thing to fix in a separate patch series. >> >> Yes, or we could just leave it - I had not realized before that it was only >> the musl job that was not running the httpd tests (I thought >> install-docker-dependencies.sh was missing the packages for ubuntu as well). >> Given that, the status quo does not seem so bad. > > I of course couldn't let go. The following would fix this:
Great, that was fast! As you've got a fix I agree it makes sense to include it in this series.
Best Wishes
Phillip
Show 46 quoted lines
> diff --git a/ci/install-docker-dependencies.sh b/ci/install-docker-dependencies.sh
> index 5e28adf55b6..48cb2e735b5 100755
> --- a/ci/install-docker-dependencies.sh
> +++ b/ci/install-docker-dependencies.sh
> @@ -21,7 +21,8 @@ linux32)
> linux-musl)
> apk add --update shadow sudo build-base curl-dev openssl-dev expat-dev gettext \
> pcre2-dev python3 musl-libintl perl-utils ncurses \
> - apache2 bash cvs gnupg perl-cgi perl-dbd-sqlite >/dev/null
> + apache2 apache2-http2 apache2-proxy apache2-ssl apache2-webdav apr-util-dbd_sqlite3 \
> + bash cvs gnupg perl-cgi perl-dbd-sqlite >/dev/null
> ;;
> linux-*)
> apt update -q &&
> diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
> index 9791f94b16f..9ea74927c40 100644
> --- a/t/lib-httpd.sh
> +++ b/t/lib-httpd.sh
> @@ -128,6 +128,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"
> }
>
> I might as well roll it into this patch series now. It increases test
> coverage on musl libc and doesn't have any significant downsides. In
> fact, it uncovers that tests on Alpine Linux don't work right now, so it
> fixes real issues to have the test coverage in our pipelines.
>
> Patrick