patch 8.2.1559: s390x tests work again

Problem:    s390x tests work again.
Solution:   re-enable s390x tests. (James McCoy, closes #6829)

diff --git a/.travis.yml b/.travis.yml
index 7f72e064e8f22289c2d628d1f9cacd55851b700a..356a8c10c64da0f0f23dd1ef51d50b6fab037d86 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -212,13 +212,12 @@ jobs:
       env:
         - *normal
         - *shadowopt
-    # Temporarily disabled, always fails
-    #- <<: *linux
-    #  arch: s390x
-    #  name: huge/gcc-s390x
-    #  compiler: gcc
-    #  env: *linux-huge
-    #  services: []
+    - <<: *linux
+      arch: s390x
+      name: huge/gcc-s390x
+      compiler: gcc
+      env: *linux-huge
+      services: []
     - <<: *linux
       arch: arm64
       name: huge/gcc-arm64

diff --git a/src/version.c b/src/version.c
index 411a889d56ac6c23d1e8020e5d412247e4c20128..158f2a3472b092d1300856bbbd2c87c7c6d6d7a3 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1559,
 /**/
     1558,
 /**/