From: George Peter Banyard <girgias@php.net>
Date: Sun, 12 Apr 2020 22:13:58 +0000 (+0200)
Subject: Add S390X architecture as a Travis job
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=850feffac0b5ae5ad63638fe1577251971c54f7a;p=php

Add S390X architecture as a Travis job

This gives us a way to compile and test a big endian architecture.

Closes GH-5382.
---

diff --git a/.travis.yml b/.travis.yml
index a3dd87ca00..7318269344 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -74,6 +74,8 @@ jobs:
           arch: amd64
         - env: ENABLE_ZTS=1 ENABLE_DEBUG=1 SKIP_IO_CAPTURE_TESTS=1 ARM64=1
           arch: arm64
+        - env: ENABLE_ZTS=1 ENABLE_DEBUG=1 SKIP_IO_CAPTURE_TESTS=1 S390X=1
+          arch: s390x
 
 before_script:
     - ccache --version
diff --git a/travis/compile.sh b/travis/compile.sh
index c1cc3aa04e..7af4bb21b0 100755
--- a/travis/compile.sh
+++ b/travis/compile.sh
@@ -9,6 +9,11 @@ if [[ "$ENABLE_DEBUG" == 1 ]]; then
 else
 	DEBUG="";
 fi
+if [[ "$S390X" == 1 ]]; then
+	S390X_CONFIG="--without-pcre-jit";
+else
+	S390X_CONFIG="";
+fi
 
 if [[ -z "$CONFIG_LOG_FILE" ]]; then
 	CONFIG_QUIET="--quiet"
@@ -32,6 +37,7 @@ MAKE_JOBS=${MAKE_JOBS:-$(nproc)}
 $CONFIG_QUIET \
 $DEBUG \
 $TS \
+$S390X_CONFIG \
 --enable-phpdbg \
 --enable-fpm \
 --with-pdo-mysql=mysqlnd \
diff --git a/travis/setup-pgsql.sh b/travis/setup-pgsql.sh
index 9172356265..d0929de9f0 100755
--- a/travis/setup-pgsql.sh
+++ b/travis/setup-pgsql.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 echo '
 <?php $conn_str .= " user=postgres"; ?>' >> "./ext/pgsql/tests/config.inc"
-if [ -z "$ARM64" ]; then
+if [ -z "$ARM64" -o -z "$S390X"]; then
   psql -c 'create database test;' -U postgres
 fi