From 5406de938c1df2608c822834be4a6496af5d10ae Mon Sep 17 00:00:00 2001 From: Jim Klimov Date: Mon, 23 Nov 2020 03:15:44 +0100 Subject: [PATCH 1/4] .travis.yml: introduce freebsd test cases with warnings (typo fix) --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5871227f6f..d78eb57d8d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -621,7 +621,7 @@ _matrix_freebsd_gnustd_nowarn: _matrix_freebsd_gnustd_warn: include: &_matrix_freebsd_gnustd_warn - - env: NUT_MATRIX_TAG="gnu99-gcc-default-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -pedantic -std=gnu99" CXXFLAGS="-Wall -Wextra -Werror -std=gnu++99" CC=gcc CXX=g++ + - env: NUT_MATRIX_TAG="gnu99-gcc-default-freebsd-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -pedantic -std=gnu99" CXXFLAGS="-Wall -Wextra -Werror -std=gnu++99" CC=gcc CXX=g++ os: freebsd compiler: gcc if: branch =~ fightwarn @@ -629,7 +629,7 @@ _matrix_freebsd_gnustd_warn: directories: - $HOME/.ccache - - env: NUT_MATRIX_TAG="gnu17-gcc-default-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -pedantic -std=gnu17" CXXFLAGS="-Wall -Wextra -Werror -std=gnu++17" CC=gcc CXX=g++ + - env: NUT_MATRIX_TAG="gnu17-gcc-default-freebsd-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -pedantic -std=gnu17" CXXFLAGS="-Wall -Wextra -Werror -std=gnu++17" CC=gcc CXX=g++ os: freebsd compiler: gcc if: branch =~ fightwarn @@ -1009,8 +1009,8 @@ jobs: #OK# - env: NUT_MATRIX_TAG="gnu99-clang-freebsd-nowarn" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu99" CXXFLAGS="-std=gnu++99" CC=clang CXX=clang++ #OK# - env: NUT_MATRIX_TAG="gnu17-gcc-freebsd-nowarn" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu99" CXXFLAGS="-std=gnu++17" CC=gcc CXX=g++ #OK# - env: NUT_MATRIX_TAG="gnu17-clang-freebsd-nowarn" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu99" CXXFLAGS="-std=gnu++17" CC=clang CXX=clang++ - - env: NUT_MATRIX_TAG="gnu99-gcc-default-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -pedantic -std=gnu99" CXXFLAGS="-Wall -Wextra -Werror -std=gnu++99" CC=gcc CXX=g++ - - env: NUT_MATRIX_TAG="gnu17-gcc-default-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -pedantic -std=gnu17" CXXFLAGS="-Wall -Wextra -Werror -std=gnu++17" CC=gcc CXX=g++ + - env: NUT_MATRIX_TAG="gnu99-gcc-default-freebsd-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -pedantic -std=gnu99" CXXFLAGS="-Wall -Wextra -Werror -std=gnu++99" CC=gcc CXX=g++ + - env: NUT_MATRIX_TAG="gnu17-gcc-default-freebsd-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -pedantic -std=gnu17" CXXFLAGS="-Wall -Wextra -Werror -std=gnu++17" CC=gcc CXX=g++ - env: NUT_MATRIX_TAG="gnu99-clang-freebsd-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -pedantic -std=gnu99" CXXFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -std=gnu++99" CC=clang CXX=clang++ - env: NUT_MATRIX_TAG="gnu17-clang-freebsd-warn" 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 CXX=clang++ ### macosx From a14f5501897fe113df6e76d0d40017a01bc3c7e3 Mon Sep 17 00:00:00 2001 From: Jim Klimov Date: Mon, 23 Nov 2020 00:29:24 +0100 Subject: [PATCH 2/4] .travis.yml: on freebsd, `pkg install libgd` explicitly (needs sudo) --- .travis.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.travis.yml b/.travis.yml index d78eb57d8d..e96672d451 100644 --- a/.travis.yml +++ b/.travis.yml @@ -593,6 +593,7 @@ _matrix_freebsd_gnustd_nowarn: include: &_matrix_freebsd_gnustd_nowarn - env: NUT_MATRIX_TAG="gnu99-gcc-freebsd-nowarn" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu99" CXXFLAGS="-std=gnu++99" CC=gcc CXX=g++ os: freebsd + sudo: true compiler: gcc cache: directories: @@ -600,6 +601,7 @@ _matrix_freebsd_gnustd_nowarn: - env: NUT_MATRIX_TAG="gnu99-clang-freebsd-nowarn" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu99" CXXFLAGS="-std=gnu++99" CC=clang CXX=clang++ os: freebsd + sudo: true compiler: clang cache: directories: @@ -607,6 +609,7 @@ _matrix_freebsd_gnustd_nowarn: - env: NUT_MATRIX_TAG="gnu17-gcc-freebsd-nowarn" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu17" CXXFLAGS="-std=gnu++17" CC=gcc CXX=g++ os: freebsd + sudo: true compiler: gcc cache: directories: @@ -614,6 +617,7 @@ _matrix_freebsd_gnustd_nowarn: - env: NUT_MATRIX_TAG="gnu17-clang-freebsd-nowarn" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu17" CXXFLAGS="-std=gnu++17" CC=clang CXX=clang++ os: freebsd + sudo: true compiler: clang cache: directories: @@ -623,6 +627,7 @@ _matrix_freebsd_gnustd_warn: include: &_matrix_freebsd_gnustd_warn - env: NUT_MATRIX_TAG="gnu99-gcc-default-freebsd-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -pedantic -std=gnu99" CXXFLAGS="-Wall -Wextra -Werror -std=gnu++99" CC=gcc CXX=g++ os: freebsd + sudo: true compiler: gcc if: branch =~ fightwarn cache: @@ -631,6 +636,7 @@ _matrix_freebsd_gnustd_warn: - env: NUT_MATRIX_TAG="gnu17-gcc-default-freebsd-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -pedantic -std=gnu17" CXXFLAGS="-Wall -Wextra -Werror -std=gnu++17" CC=gcc CXX=g++ os: freebsd + sudo: true compiler: gcc if: branch =~ fightwarn cache: @@ -639,6 +645,7 @@ _matrix_freebsd_gnustd_warn: - env: NUT_MATRIX_TAG="gnu99-clang-freebsd-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -pedantic -std=gnu99" CXXFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -std=gnu++99" CC=clang CXX=clang++ os: freebsd + sudo: true compiler: clang if: branch =~ fightwarn cache: @@ -647,6 +654,7 @@ _matrix_freebsd_gnustd_warn: - env: NUT_MATRIX_TAG="gnu17-clang-freebsd-warn" 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 CXX=clang++ os: freebsd + sudo: true compiler: clang if: branch =~ fightwarn cache: @@ -1080,6 +1088,7 @@ before_install: setfacl -f /tmp/faclx /C/tools/cygwin/*bin/* fi fi +- if [ "$TRAVIS_OS_NAME" = "freebsd" ] ; then sudo pkg install -y libgd ; fi - if [ -n "${NUT_MATRIX_TAG}" ] ; then export CFLAGS CXXFLAGS ; [ -z "$CC" ] || export CC ; [ -z "$CXX" ] || export CXX ; fi # Hand off to generated script for each BUILD_TYPE From 3e13e7ff13c285be3c80e9d095c9f94f6dcf4b23 Mon Sep 17 00:00:00 2001 From: Jim Klimov Date: Mon, 23 Nov 2020 04:30:00 +0100 Subject: [PATCH 3/4] .travis.yml: mark "gnuXX-gcc-freebsd-warn" cases as evergreen to keep that way --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e96672d451..a95e88e71c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1017,8 +1017,8 @@ jobs: #OK# - env: NUT_MATRIX_TAG="gnu99-clang-freebsd-nowarn" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu99" CXXFLAGS="-std=gnu++99" CC=clang CXX=clang++ #OK# - env: NUT_MATRIX_TAG="gnu17-gcc-freebsd-nowarn" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu99" CXXFLAGS="-std=gnu++17" CC=gcc CXX=g++ #OK# - env: NUT_MATRIX_TAG="gnu17-clang-freebsd-nowarn" BUILD_TYPE=default-all-errors CFLAGS="-std=gnu99" CXXFLAGS="-std=gnu++17" CC=clang CXX=clang++ - - env: NUT_MATRIX_TAG="gnu99-gcc-default-freebsd-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -pedantic -std=gnu99" CXXFLAGS="-Wall -Wextra -Werror -std=gnu++99" CC=gcc CXX=g++ - - env: NUT_MATRIX_TAG="gnu17-gcc-default-freebsd-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -pedantic -std=gnu17" CXXFLAGS="-Wall -Wextra -Werror -std=gnu++17" CC=gcc CXX=g++ +#OK# - env: NUT_MATRIX_TAG="gnu99-gcc-default-freebsd-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -pedantic -std=gnu99" CXXFLAGS="-Wall -Wextra -Werror -std=gnu++99" CC=gcc CXX=g++ +#OK# - env: NUT_MATRIX_TAG="gnu17-gcc-default-freebsd-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -pedantic -std=gnu17" CXXFLAGS="-Wall -Wextra -Werror -std=gnu++17" CC=gcc CXX=g++ - env: NUT_MATRIX_TAG="gnu99-clang-freebsd-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -pedantic -std=gnu99" CXXFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -std=gnu++99" CC=clang CXX=clang++ - env: NUT_MATRIX_TAG="gnu17-clang-freebsd-warn" 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 CXX=clang++ ### macosx From 1dde846a5d577bbbb879ac5934297f832b9fadf1 Mon Sep 17 00:00:00 2001 From: Jim Klimov Date: Mon, 23 Nov 2020 04:31:44 +0100 Subject: [PATCH 4/4] .travis.yml: separate the matrix for _matrix_freebsd_gnustd_warn_viable and ..._fatal cases --- .travis.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a95e88e71c..ca5608663e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -623,8 +623,8 @@ _matrix_freebsd_gnustd_nowarn: directories: - $HOME/.ccache -_matrix_freebsd_gnustd_warn: - include: &_matrix_freebsd_gnustd_warn +_matrix_freebsd_gnustd_warn_viable: + include: &_matrix_freebsd_gnustd_warn_viable - env: NUT_MATRIX_TAG="gnu99-gcc-default-freebsd-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -pedantic -std=gnu99" CXXFLAGS="-Wall -Wextra -Werror -std=gnu++99" CC=gcc CXX=g++ os: freebsd sudo: true @@ -643,6 +643,8 @@ _matrix_freebsd_gnustd_warn: directories: - $HOME/.ccache +_matrix_freebsd_gnustd_warn_fatal: + include: &_matrix_freebsd_gnustd_warn_fatal - env: NUT_MATRIX_TAG="gnu99-clang-freebsd-warn" BUILD_TYPE=default-all-errors CFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -pedantic -std=gnu99" CXXFLAGS="-Wall -Wextra -Werror -Weverything -Wno-unused-macros -Wno-reserved-id-macro -Wno-padded -std=gnu++99" CC=clang CXX=clang++ os: freebsd sudo: true @@ -875,13 +877,19 @@ _matrix_freebsd: - *_matrix_freebsd_gnustd_nowarn - *_matrix_freebsd_gnustd_warn +_matrix_freebsd_gnustd_warn: + include: &_matrix_freebsd_gnustd_warn + - *_matrix_freebsd_gnustd_warn_viable + - *_matrix_freebsd_gnustd_warn_fatal + _matrix_required_freebsd: include: &_matrix_required_freebsd - *_matrix_freebsd_gnustd_nowarn + - *_matrix_freebsd_gnustd_warn_viable _matrix_allowfail_freebsd: include: &_matrix_allowfail_freebsd - - *_matrix_freebsd_gnustd_warn + - *_matrix_freebsd_gnustd_warn_fatal _matrix_allowfail_osx: include: &_matrix_allowfail_osx