# HG changeset patch # User Bram Moolenaar # Date 1598976005 -7200 # Node ID ef929329affe45a0773e626c46b5f6d45d3b6f6a # Parent 76cdf23886c791ee314d247884194c72fc932dfb patch 8.2.1559: s390x tests work again Commit: https://github.com/vim/vim/commit/ca563b9b948aec18463c26e9f87ae7933571b40e Author: Bram Moolenaar Date: Tue Sep 1 17:50:51 2020 +0200 patch 8.2.1559: s390x tests work again Problem: s390x tests work again. Solution: re-enable s390x tests. (James McCoy, closes https://github.com/vim/vim/issues/6829) diff --git a/.travis.yml b/.travis.yml --- 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 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1559, +/**/ 1558, /**/ 1557,