From: Joe Orton Date: Wed, 25 Mar 2020 15:36:27 +0000 (+0000) Subject: Merge r1875648 from trunk: X-Git-Tag: 2.4.43~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=58713cac14329e49592e92343a8f30d32b61c997;p=thirdparty%2Fapache%2Fhttpd.git Merge r1875648 from trunk: Drop -v from arm64 test runs and add to allowed failures, it is still not as reliable as x86 builds. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1875649 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/.travis.yml b/.travis.yml index 27808dee5c3..65a90cf92df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,7 +52,6 @@ jobs: - name: Linux arm64 Ubuntu, all-modules arch: arm64 env: CONFIG="--enable-mods-shared=reallyall" - TEST_ARGS="-v" # ------------------------------------------------------------------------- - if: branch = trunk name: Linux i386 Ubuntu, Shared MPMs, most modules, maintainer-mode w/-Werror @@ -230,9 +229,11 @@ jobs: env: NOTEST_CFLAGS="-fsanitize=undefined -fno-sanitize-recover=undefined" NOTEST_LIBS=-lubsan CONFIG="--enable-mods-shared=reallyall --disable-http2" TEST_UBSAN=1 allow_failures: - # s390x is sometimes flaky + # non-x86 are sometimes flaky - arch: s390x env: CONFIG="--enable-mods-shared=reallyall" + - arch: arm64 + env: CONFIG="--enable-mods-shared=reallyall" # CPAN modules are to be used with the system Perl and always with # CC=gcc, e.g. for the CC="gcc -m32" case the builds are not correct