From: Joe Orton <jorton@apache.org>
Date: Thu, 21 Nov 2019 10:46:38 +0000 (+0000)
Subject: Build on s390x (interesting test target since it's big-endian).
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1778
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0220567ff33d76f3108d4d21ecb381e232503851;p=thirdparty%2Fapache%2Fhttpd.git

Build on s390x (interesting test target since it's big-endian).
IRC notifications work, e-mail doesn't; branches are done.
ppc64le builds also work but are extremely slow, so not enabled.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1870080 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/.travis.yml b/.travis.yml
index fdb26de9fa2..fd67cee25f3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,9 +7,15 @@ cache:
   directories:
     - /home/travis/perl5
     - /home/travis/root
+# The non-x86_64 images currently lack cpanminus, when that is fixed
+# the cpanminus & universe sourceline can be removed.
 addons:
   apt:
+    update: false
+    sources:
+      - sourceline: 'deb http://archive.ubuntu.com/ubuntu $(lsb_release -sc) universe'
     packages:
+      - cpanminus
       - libtool-bin
       - libapr1-dev
       - libaprutil1-dev
@@ -29,6 +35,10 @@ matrix:
   include:
     - name: Linux Ubuntu, Default module set
     # -------------------------------------------------------------------------
+    - name: Linux s390x Ubuntu, all-modules
+      arch: s390x
+      env: CONFIG="--enable-mods-shared=reallyall"
+    # -------------------------------------------------------------------------
     - name: Linux Ubuntu, Default, all-modules
       env: CONFIG="--enable-mods-shared=reallyall"
     # -------------------------------------------------------------------------
diff --git a/test/README.travis b/test/README.travis
index d73f4068675..0c97d9918a6 100644
--- a/test/README.travis
+++ b/test/README.travis
@@ -40,12 +40,12 @@ TODO list
 * MacOS build
 * Windows build
 * clang-on-Linux build
-* Build using APR non-trunk branches (1.7.x etc)
-   - need to make the ~/root/apr-trunk caching logic work for non-trunk branches
 * Multi-arch testing
+ - non-x86_64 images lack installed cpanminus and don't enable caching.
+   ppc64le builds seem unreasonably slow to install CPAN deps each time
+   (15-20 minutes) - not sure why.  s390x is enabled & seems reasonably fast.
 * Use containers for non-Ubuntu-based Linux testing
 * E-mail notifications
-* IRC notifications
 * VPATH builds
 * sanity checks for use of APLOGNO() - empty arguments, accidental duplicates, etc.
  - not sure how exactly