]> granicus.if.org Git - php/commitdiff
Add S390X architecture as a Travis job
authorGeorge Peter Banyard <girgias@php.net>
Sun, 12 Apr 2020 22:13:58 +0000 (00:13 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Thu, 16 Apr 2020 10:20:50 +0000 (12:20 +0200)
This gives us a way to compile and test a big endian architecture.

Closes GH-5382.

.travis.yml
travis/compile.sh
travis/setup-pgsql.sh

index a3dd87ca0088cf1aaf2b42974a4bf8b048f8f157..7318269344bbf776dafa3d8bcabf312a385e1133 100644 (file)
@@ -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
index c1cc3aa04ed736046034f4332a6a9ff9bce5329d..7af4bb21b0d413dbf71543ac9a648c6326a931dd 100755 (executable)
@@ -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 \
index 91723562653cf749c0b6eacefcad6f6245af36d8..d0929de9f0afdb3592394bd33b4e49577919d4d0 100755 (executable)
@@ -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