From c71885d23779f51ccd9d66bce686faaaa44c6ea0 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vz-swig@zeitlins.org>
Date: Mon, 25 May 2020 16:12:32 +0200
Subject: Switch one of Travis CI Ruby builds to use s390x arch

Check if the tests work correctly in big endian environment.
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index cedce513d..a71f3e0e3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -351,6 +351,7 @@ matrix:
       sudo: required
       dist: xenial
     - os: linux
+      arch: s390x
       env: SWIGLANG=ruby CPP11=1
       sudo: required
       dist: xenial
-- 
cgit v1.2.1


From 05b6f07940f6d942afeae58fc024510e054ce585 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vz-swig@zeitlins.org>
Date: Mon, 25 May 2020 23:01:54 +0200
Subject: Don't fail the build if CPU model or memory can't be detected

This is purely informative anyhow and there is no reason to stop the
build just because this information couldn't be found (as happens when
running in s390x VM, for example).

Also avoid useless use of cat.
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index a71f3e0e3..98a1b6319 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -495,7 +495,7 @@ matrix:
 before_install:
   - date -u
   - uname -a
-  - if test "$TRAVIS_OS_NAME" = "linux"; then lscpu && cat /proc/cpuinfo | grep "model name" && cat /proc/meminfo | grep MemTotal; fi
+  - if test "$TRAVIS_OS_NAME" = "linux"; then lscpu; grep "model name" /proc/cpuinfo || echo 'Unknown CPU model'; grep "MemTotal" /proc/meminfo || echo 'Unknown system memory amount'; fi
   - if test "$TRAVIS_OS_NAME" = "osx"; then sysctl -a | grep brand_string; fi
   # Travis overrides CC environment with compiler predefined values
   - if test -n "$GCC"; then export CC="gcc-$GCC" && export CXX="g++-$GCC"; fi
-- 
cgit v1.2.1


From 3867639897aad9fb2c48dc84ddab47c9c8206689 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Tue, 2 Jun 2020 23:24:56 +0100
Subject: Travis ruby s390x (big endian) architecture testing

Currently failing on this architecture.
Add s390x testing for Ruby c++11 Xenial rather than replace AMD Ruby
C++11 Xenial testing.
---
 .travis.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 98a1b6319..4aac0e773 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -351,7 +351,6 @@ matrix:
       sudo: required
       dist: xenial
     - os: linux
-      arch: s390x
       env: SWIGLANG=ruby CPP11=1
       sudo: required
       dist: xenial
@@ -415,6 +414,11 @@ matrix:
       env: SWIGLANG=python GCC=9 CPP17=1 PY3=3 VER=3.8
       sudo: required
       dist: xenial
+    - os: linux
+      arch: s390x
+      env: SWIGLANG=ruby CPP11=1
+      sudo: required
+      dist: xenial
     - compiler: gcc
       os: osx
       env: SWIGLANG=
@@ -464,6 +468,12 @@ matrix:
       osx_image: xcode10.2
 
   allow_failures:
+    # li_std_wstring failure see https://github.com/swig/swig/pull/1803
+    - os: linux
+      arch: s390x
+      env: SWIGLANG=ruby CPP11=1
+      sudo: required
+      dist: xenial
     # Newer version of D not yet working/supported
     - compiler: gcc
       os: linux
-- 
cgit v1.2.1