On Mon, Oct 30, 2023 at 01:15:10PM +0100, Patrick Steinhardt wrote: > The linux-musl CI job executes tests on Alpine Linux, which is based on > musl libc instead of glibc. We're missing some test dependencies though, > which causes us to skip a subset of tests. > > Install these test dependencies to increase our test coverage on this > platform. There are still some missing test dependecies, but these do > not have a corresponding package in the Alpine repositories: > > - p4 and p4d, both parts of the Perforce version control system. > > - cvsps, which generates patch sets for CVS. > > - Subversion and the SVN::Core Perl library, the latter of which is > not available in the Alpine repositories. While the tool itself is > available, all Subversion-related tests are skipped without the > SVN::Core Perl library anyway. > > Furthermore, in order to make the Apache-based tests work, this commit > also adds the Alpine-specific modules path of it to the list of known > paths. > > Signed-off-by: Patrick Steinhardt <ps@xxxxxx> > --- > ci/install-docker-dependencies.sh | 3 ++- > t/lib-httpd.sh | 3 ++- > 2 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/ci/install-docker-dependencies.sh b/ci/install-docker-dependencies.sh > index d0bc19d3bb3..05dde5c5d40 100755 > --- a/ci/install-docker-dependencies.sh > +++ b/ci/install-docker-dependencies.sh > @@ -17,7 +17,8 @@ linux32) > ;; > linux-musl) > apk add --update build-base curl-dev openssl-dev expat-dev gettext \ > - pcre2-dev python3 musl-libintl perl-utils ncurses >/dev/null > + pcre2-dev python3 musl-libintl perl-utils ncurses \ > + apache2 bash cvs gnupg perl-cgi perl-dbd-sqlite >/dev/null Meh. I just noticed that I missed a few other dependencies to make Apache2 work: diff --git a/ci/install-docker-dependencies.sh b/ci/install-docker-dependencies.sh index 5e28adf55b..ce910e3f3c 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 \ + bash cvs gnupg perl-cgi perl-dbd-sqlite >/dev/null ;; linux-*) apt update -q && 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. Patrick > ;; > pedantic) > dnf -yq update >/dev/null && > diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh > index 2fb1b2ae561..9791f94b16f 100644 > --- a/t/lib-httpd.sh > +++ b/t/lib-httpd.sh > @@ -67,7 +67,8 @@ for DEFAULT_HTTPD_MODULE_PATH in '/usr/libexec/apache2' \ > '/usr/lib/apache2/modules' \ > '/usr/lib64/httpd/modules' \ > '/usr/lib/httpd/modules' \ > - '/usr/libexec/httpd' > + '/usr/libexec/httpd' \ > + '/usr/lib/apache2' > do > if test -d "$DEFAULT_HTTPD_MODULE_PATH" > then > -- > 2.42.0 >
Attachment:
signature.asc
Description: PGP signature
