]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Merge r1875648 from trunk:
authorJoe Orton <jorton@apache.org>
Wed, 25 Mar 2020 15:36:27 +0000 (15:36 +0000)
committerJoe Orton <jorton@apache.org>
Wed, 25 Mar 2020 15:36:27 +0000 (15:36 +0000)
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

.travis.yml

index 27808dee5c356192263ce92360a25ee76fdb5624..65a90cf92df930dd3b5f3e4ec78d325299997e8b 100644 (file)
@@ -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