From 0ad4c5a2c90adaad955d3607a61aebad394bf0e3 Mon Sep 17 00:00:00 2001 From: Jim Klimov Date: Tue, 24 Nov 2020 21:34:47 +0100 Subject: [PATCH 1/3] Issue #823 follow-up: add s390x (BigEndian) builds in Travis CI --- .travis.yml | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/.travis.yml b/.travis.yml index b06bc447bd..1cbaf84179 100644 --- a/.travis.yml +++ b/.travis.yml @@ -341,6 +341,76 @@ _matrix_linux_gnustd_nowarn: packages: - *deps_driverlibs +# Try s390x builds to check for issues with endianness +# (it is one current Travis offer with BigEndian CPUs) +_matrix_linux_gnustd_nowarn_s390x_64bit_viable: + include: &_matrix_linux_gnustd_nowarn_s390x_64bit_viable + - env: NUT_MATRIX_TAG="gnu99-gcc-default-nowarn-s390x-64bit" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu99" CXXFLAGS="-std=gnu++98" + os: linux + arch: s390x + sudo: false + services: + - docker + compiler: gcc + addons: + apt: + packages: + - *deps_driverlibs + + - env: NUT_MATRIX_TAG="gnu17-gcc-9-nowarn-s390x-64bit" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu17" CXXFLAGS="-std=gnu++17" CC=gcc-9 CXX=g++-9 + os: linux + arch: s390x + sudo: false + services: + - docker + compiler: gcc + addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-9 + - gcc-9 + - *deps_driverlibs + + - env: NUT_MATRIX_TAG="gnu17-clang-8-nowarn-s390x-64bit" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu17" CXXFLAGS="-std=gnu++17" CC=clang-8 CXX=clang++-8 + os: linux + arch: s390x + dist: xenial + sudo: false + services: + - docker + compiler: clang + if: branch =~ fightwarn + addons: + apt: + sources: + - llvm-toolchain-xenial-8 + packages: + - clang-8 + - clang-format-8 + - *deps_driverlibs + +_matrix_linux_gnustd_nowarn_s390x_64bit_fatal: + include: &_matrix_linux_gnustd_nowarn_s390x_64bit_fatal + - env: NUT_MATRIX_TAG="gnu17-clang-8-warn-s390x-64bit" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -pedantic -std=gnu17" CXXFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -std=gnu++17" CC=clang-8 CXX=clang++-8 + os: linux + arch: s390x + dist: xenial + sudo: false + services: + - docker + compiler: clang + if: branch =~ fightwarn + addons: + apt: + sources: + - llvm-toolchain-xenial-8 + packages: + - clang-8 + - clang-format-8 + - *deps_driverlibs + # Try ARM builds to check for issues with non-x86 CPUs _matrix_linux_gnustd_nowarn_arm_64bit_viable: include: &_matrix_linux_gnustd_nowarn_arm_64bit_viable @@ -907,6 +977,7 @@ _matrix_required_linux: - *_matrix_linux_gnustd_nowarn - *_matrix_linux_gnustd_warn_viable - *_matrix_linux_gnustd_nowarn_arm_64bit_viable + - *_matrix_linux_gnustd_nowarn_s390x_64bit_viable _matrix_linux_gnustd_warn: include: &_matrix_linux_gnustd_warn @@ -919,6 +990,7 @@ _matrix_allowfail_linux: - *_matrix_linux_gnustd_warn_fatal - *_matrix_linux_cstd_warn - *_matrix_linux_gnustd_nowarn_arm_64bit_fatal + - *_matrix_linux_gnustd_nowarn_s390x_64bit_fatal _matrix_linux_gnustd_nowarn_arm_64bit: include: &_matrix_linux_gnustd_nowarn_arm_64bit @@ -929,6 +1001,15 @@ _matrix_linux_arm: include: &_matrix_linux_arm - *_matrix_linux_gnustd_nowarn_arm_64bit +_matrix_linux_gnustd_nowarn_s390x_64bit: + include: &_matrix_linux_gnustd_nowarn_s390x_64bit + - *_matrix_linux_gnustd_nowarn_s390x_64bit_viable + - *_matrix_linux_gnustd_nowarn_s390x_64bit_fatal + +_matrix_linux_s390x: + include: &_matrix_linux_s390x + - *_matrix_linux_gnustd_nowarn_s390x_64bit + _matrix_linux: include: &_matrix_linux - *_matrix_required_linux @@ -999,6 +1080,8 @@ _matrix_gnustd_nowarn: # -*_matrix_windows_gnustd_nowarn - *_matrix_linux_gnustd_nowarn_arm_64bit_viable - *_matrix_linux_gnustd_nowarn_arm_64bit_fatal + - *_matrix_linux_gnustd_nowarn_s390x_64bit_viable + - *_matrix_linux_gnustd_nowarn_s390x_64bit_fatal _matrix_warn: include: &_matrix_warn @@ -1087,6 +1170,12 @@ jobs: - env: NUT_MATRIX_TAG="c89-gcc-default-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -pedantic -std=c89" CXXFLAGS="-Wall -Wextra -Werror -std=c++89" - env: NUT_MATRIX_TAG="gnu89-gcc-default-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -pedantic -std=gnu89" CXXFLAGS="-Wall -Wextra -Werror -std=gnu++89" +### Linux on s390x (BigEndian) + - env: NUT_MATRIX_TAG="gnu99-gcc-default-nowarn-s390x-64bit" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu99" CXXFLAGS="-std=gnu++98" + - env: NUT_MATRIX_TAG="gnu17-gcc-9-nowarn-s390x-64bit" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu17" CXXFLAGS="-std=gnu++17" CC=gcc-9 CXX=g++-9 + - env: NUT_MATRIX_TAG="gnu17-clang-8-nowarn-s390x-64bit" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu17" CXXFLAGS="-std=gnu++17" CC=clang-8 CXX=clang++-8 + - env: NUT_MATRIX_TAG="gnu17-clang-8-warn-s390x-64bit" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -pedantic -std=gnu17" CXXFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -std=gnu++17" CC=clang-8 CXX=clang++-8 + ### Linux on ARM #OK# - env: NUT_MATRIX_TAG="gnu99-gcc-default-nowarn-ARM-64bit" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu99" CXXFLAGS="-std=gnu++98" #OK# - env: NUT_MATRIX_TAG="gnu17-gcc-9-nowarn-ARM-64bit" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu17" CXXFLAGS="-std=gnu++17" CC=gcc-9 CXX=g++-9 From ea05a529915a51285e86554098d5a2bb2dc04fac Mon Sep 17 00:00:00 2001 From: Jim Klimov Date: Wed, 25 Nov 2020 09:55:40 +0100 Subject: [PATCH 2/3] .travis.yml: xenial@s390x does not have "time" for us --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 1cbaf84179..f86b692969 100644 --- a/.travis.yml +++ b/.travis.yml @@ -356,6 +356,7 @@ _matrix_linux_gnustd_nowarn_s390x_64bit_viable: apt: packages: - *deps_driverlibs + - time - env: NUT_MATRIX_TAG="gnu17-gcc-9-nowarn-s390x-64bit" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu17" CXXFLAGS="-std=gnu++17" CC=gcc-9 CXX=g++-9 os: linux @@ -372,6 +373,7 @@ _matrix_linux_gnustd_nowarn_s390x_64bit_viable: - g++-9 - gcc-9 - *deps_driverlibs + - time - env: NUT_MATRIX_TAG="gnu17-clang-8-nowarn-s390x-64bit" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu17" CXXFLAGS="-std=gnu++17" CC=clang-8 CXX=clang++-8 os: linux @@ -410,6 +412,7 @@ _matrix_linux_gnustd_nowarn_s390x_64bit_fatal: - clang-8 - clang-format-8 - *deps_driverlibs + - time # Try ARM builds to check for issues with non-x86 CPUs _matrix_linux_gnustd_nowarn_arm_64bit_viable: From 485dc8b394ad1c7942c9f2c2a1a6f404c0c6e077 Mon Sep 17 00:00:00 2001 From: Jim Klimov Date: Thu, 26 Nov 2020 12:30:18 +0100 Subject: [PATCH 3/3] .travis.yml: mark "gnu*-nowarn-s390x" test cases evergreen --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f86b692969..c2bd765963 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1174,9 +1174,9 @@ jobs: - env: NUT_MATRIX_TAG="gnu89-gcc-default-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -pedantic -std=gnu89" CXXFLAGS="-Wall -Wextra -Werror -std=gnu++89" ### Linux on s390x (BigEndian) - - env: NUT_MATRIX_TAG="gnu99-gcc-default-nowarn-s390x-64bit" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu99" CXXFLAGS="-std=gnu++98" - - env: NUT_MATRIX_TAG="gnu17-gcc-9-nowarn-s390x-64bit" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu17" CXXFLAGS="-std=gnu++17" CC=gcc-9 CXX=g++-9 - - env: NUT_MATRIX_TAG="gnu17-clang-8-nowarn-s390x-64bit" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu17" CXXFLAGS="-std=gnu++17" CC=clang-8 CXX=clang++-8 +#OK# - env: NUT_MATRIX_TAG="gnu99-gcc-default-nowarn-s390x-64bit" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu99" CXXFLAGS="-std=gnu++98" +#OK# - env: NUT_MATRIX_TAG="gnu17-gcc-9-nowarn-s390x-64bit" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu17" CXXFLAGS="-std=gnu++17" CC=gcc-9 CXX=g++-9 +#OK# - env: NUT_MATRIX_TAG="gnu17-clang-8-nowarn-s390x-64bit" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu17" CXXFLAGS="-std=gnu++17" CC=clang-8 CXX=clang++-8 - env: NUT_MATRIX_TAG="gnu17-clang-8-warn-s390x-64bit" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -pedantic -std=gnu17" CXXFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -std=gnu++17" CC=clang-8 CXX=clang++-8 ### Linux on ARM