Clean up CI tests

This change updates the gcc-4.8 tests to use the same naming convention and test
settings as the gcc-11 tests.

The change also adds OPENMP for the Fortran tests.

Signed-off-by: Nicolas Bock <nicolasbock@gmail.com>

.github/workflows/CI.yaml

@@ -50,14 +50,22 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - JOBNAME: gcc-4.8 test 1
-            TEST_SCRIPT: ./scripts/ci-gcc-4.8-test-1.sh
-          - JOBNAME: gcc-4.8 test 2
-            TEST_SCRIPT: ./scripts/ci-gcc-4.8-test-2.sh
-          - JOBNAME: gcc-4.8 test 3
-            TEST_SCRIPT: ./scripts/ci-gcc-4.8-test-3.sh
-          - JOBNAME: gcc-4.8 test 4
-            TEST_SCRIPT: ./scripts/ci-gcc-4.8-test-4.sh
+          - JOBNAME: gcc-4.8 C single real
+            TEST_SCRIPT: ./scripts/ci-gcc-4.8-C-single-real.sh
+          - JOBNAME: gcc-4.8 C double real
+            TEST_SCRIPT: ./scripts/ci-gcc-4.8-C-double-real.sh
+          - JOBNAME: gcc-4.8 C single complex
+            TEST_SCRIPT: ./scripts/ci-gcc-4.8-C-single-complex.sh
+          - JOBNAME: gcc-4.8 C double complex
+            TEST_SCRIPT: ./scripts/ci-gcc-4.8-C-double-complex.sh
+          - JOBNAME: gcc-4.8 Fortran single real
+            TEST_SCRIPT: ./scripts/ci-gcc-4.8-Fortran-single-real.sh
+          - JOBNAME: gcc-4.8 Fortran double real
+            TEST_SCRIPT: ./scripts/ci-gcc-4.8-Fortran-double-real.sh
+          - JOBNAME: gcc-4.8 Fortran single complex
+            TEST_SCRIPT: ./scripts/ci-gcc-4.8-Fortran-single-complex.sh
+          - JOBNAME: gcc-4.8 Fortran double complex
+            TEST_SCRIPT: ./scripts/ci-gcc-4.8-Fortran-double-complex.sh
           - JOBNAME: gcc-11 C single real
             TEST_SCRIPT: ./scripts/ci-gcc-11-C-single-real.sh
           - JOBNAME: gcc-11 C double real

scripts/ci-gcc-11-Fortran-double-complex.sh

@@ -8,7 +8,7 @@ export CC=${CC:-gcc-11}
 export CXX=${CXX:-g++-11}
 export FC=${FC:-gfortran-11}
 export BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-no}
-export BML_OPENMP=${BML_OPENMP:-no}
+export BML_OPENMP=${BML_OPENMP:-yes}
 export BML_INTERNAL_BLAS=${BML_INTERNAL_BLAS:-no}
 export TESTING_EXTRA_ARGS=${TESTING_EXTRA_ARGS:-"-R fortran-.*-double_complex"}
 export BML_VALGRIND=${BML_VALGRIND:-yes}

scripts/ci-gcc-11-Fortran-double-real.sh

@@ -8,7 +8,7 @@ export CC=${CC:-gcc-11}
 export CXX=${CXX:-g++-11}
 export FC=${FC:-gfortran-11}
 export BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-no}
-export BML_OPENMP=${BML_OPENMP:-no}
+export BML_OPENMP=${BML_OPENMP:-yes}
 export BML_INTERNAL_BLAS=${BML_INTERNAL_BLAS:-no}
 export TESTING_EXTRA_ARGS=${TESTING_EXTRA_ARGS:-"-R fortran-.*-double_real"}
 export BML_VALGRIND=${BML_VALGRIND:-yes}

scripts/ci-gcc-11-Fortran-single-complex.sh

@@ -8,7 +8,7 @@ export CC=${CC:-gcc-11}
 export CXX=${CXX:-g++-11}
 export FC=${FC:-gfortran-11}
 export BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-no}
-export BML_OPENMP=${BML_OPENMP:-no}
+export BML_OPENMP=${BML_OPENMP:-yes}
 export BML_INTERNAL_BLAS=${BML_INTERNAL_BLAS:-no}
 export TESTING_EXTRA_ARGS=${TESTING_EXTRA_ARGS:-"-R fortran-.*-single_complex"}
 export BML_VALGRIND=${BML_VALGRIND:-yes}

scripts/ci-gcc-11-Fortran-single-real.sh

@@ -8,7 +8,7 @@ export CC=${CC:-gcc-11}
 export CXX=${CXX:-g++-11}
 export FC=${FC:-gfortran-11}
 export BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-no}
-export BML_OPENMP=${BML_OPENMP:-no}
+export BML_OPENMP=${BML_OPENMP:-yes}
 export BML_INTERNAL_BLAS=${BML_INTERNAL_BLAS:-no}
 export TESTING_EXTRA_ARGS=${TESTING_EXTRA_ARGS:-"-R fortran-.*-single_real"}
 export BML_VALGRIND=${BML_VALGRIND:-yes}

scripts/ci-gcc-4.8-test-2.sh → scripts/ci-gcc-4.8-C-double-complex.sh

@@ -7,9 +7,11 @@ basedir=$(readlink --canonicalize $(dirname $0)/..)
 export CC=${CC:-gcc-4.8}
 export CXX=${CXX:-g++-4.8}
 export FC=${FC:-gfortran-4.8}
-export BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-yes}
+export BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-no}
 export BML_OPENMP=${BML_OPENMP:-no}
-export BML_INTERNAL_BLAS=${BML_INTERNAL_BLAS:-yes}
+export BML_INTERNAL_BLAS=${BML_INTERNAL_BLAS:-no}
+export TESTING_EXTRA_ARGS=${TESTING_EXTRA_ARGS:-"-R C-.*-double_complex"}
+export BML_VALGRIND=${BML_VALGRIND:-yes}
 
 [[ -f ${basedir}/scripts/ci-defaults.sh ]] && . ${basedir}/scripts/ci-defaults.sh
 

scripts/ci-gcc-4.8-test-1.sh → scripts/ci-gcc-4.8-C-double-real.sh

@@ -7,9 +7,11 @@ basedir=$(readlink --canonicalize $(dirname $0)/..)
 export CC=${CC:-gcc-4.8}
 export CXX=${CXX:-g++-4.8}
 export FC=${FC:-gfortran-4.8}
-export BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-yes}
+export BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-no}
 export BML_OPENMP=${BML_OPENMP:-no}
 export BML_INTERNAL_BLAS=${BML_INTERNAL_BLAS:-no}
+export TESTING_EXTRA_ARGS=${TESTING_EXTRA_ARGS:-"-R C-.*-double_real"}
+export BML_VALGRIND=${BML_VALGRIND:-yes}
 
 [[ -f ${basedir}/scripts/ci-defaults.sh ]] && . ${basedir}/scripts/ci-defaults.sh
 

scripts/ci-gcc-4.8-test-4.sh → scripts/ci-gcc-4.8-C-single-complex.sh

@@ -7,9 +7,11 @@ basedir=$(readlink --canonicalize $(dirname $0)/..)
 export CC=${CC:-gcc-4.8}
 export CXX=${CXX:-g++-4.8}
 export FC=${FC:-gfortran-4.8}
-export BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-yes}
-export BML_OPENMP=${BML_OPENMP:-yes}
-export BML_INTERNAL_BLAS=${BML_INTERNAL_BLAS:-yes}
+export BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-no}
+export BML_OPENMP=${BML_OPENMP:-no}
+export BML_INTERNAL_BLAS=${BML_INTERNAL_BLAS:-no}
+export TESTING_EXTRA_ARGS=${TESTING_EXTRA_ARGS:-"-R C-.*-single_complex"}
+export BML_VALGRIND=${BML_VALGRIND:-yes}
 
 [[ -f ${basedir}/scripts/ci-defaults.sh ]] && . ${basedir}/scripts/ci-defaults.sh
 

scripts/ci-gcc-4.8-test-3.sh → scripts/ci-gcc-4.8-C-single-real.sh

@@ -7,9 +7,11 @@ basedir=$(readlink --canonicalize $(dirname $0)/..)
 export CC=${CC:-gcc-4.8}
 export CXX=${CXX:-g++-4.8}
 export FC=${FC:-gfortran-4.8}
-export BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-yes}
-export BML_OPENMP=${BML_OPENMP:-yes}
+export BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-no}
+export BML_OPENMP=${BML_OPENMP:-no}
 export BML_INTERNAL_BLAS=${BML_INTERNAL_BLAS:-no}
+export TESTING_EXTRA_ARGS=${TESTING_EXTRA_ARGS:-"-R C-.*-single_real"}
+export BML_VALGRIND=${BML_VALGRIND:-yes}
 
 [[ -f ${basedir}/scripts/ci-defaults.sh ]] && . ${basedir}/scripts/ci-defaults.sh
 

scripts/ci-gcc-4.8-Fortran-double-complex.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+set -e -u -x
+
+basedir=$(readlink --canonicalize $(dirname $0)/..)
+
+export CC=${CC:-gcc-4.8}
+export CXX=${CXX:-g++-4.8}
+export FC=${FC:-gfortran-4.8}
+export BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-no}
+export BML_OPENMP=${BML_OPENMP:-yes}
+export BML_INTERNAL_BLAS=${BML_INTERNAL_BLAS:-no}
+export TESTING_EXTRA_ARGS=${TESTING_EXTRA_ARGS:-"-R fortran-.*-double_complex"}
+export BML_VALGRIND=${BML_VALGRIND:-yes}
+
+# [nicolasbock] Valgrind cannot handle a Debug build with valgrind and
+# fails with:
+#
+# parse DIE(readdwarf3.c:3619): confused by:
+#  <2><60e>: Abbrev Number: 25 (DW_TAG_subrange_type)
+#      DW_AT_type        : <42>
+#      DW_AT_upper_bound : 4 byte block: 91 c0 7b 6
+# parse_type_DIE:
+# --18653-- WARNING: Serious error when reading debug info
+# --18653-- When reading debug info from /home/runner/work/bml/bml/build/tests/Fortran-tests/bml-testf:
+# --18653-- confused by the above DIE
+#
+# Bionic ships with valgrind-3.13.0. This issue might be fixed with
+# later versions.
+#
+# Re-review once we have a backport of valgrind for Bionic.
+export CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Release}
+
+[[ -f ${basedir}/scripts/ci-defaults.sh ]] && . ${basedir}/scripts/ci-defaults.sh
+
+${basedir}/build.sh --debug testing

scripts/ci-gcc-4.8-Fortran-double-real.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+set -e -u -x
+
+basedir=$(readlink --canonicalize $(dirname $0)/..)
+
+export CC=${CC:-gcc-4.8}
+export CXX=${CXX:-g++-4.8}
+export FC=${FC:-gfortran-4.8}
+export BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-no}
+export BML_OPENMP=${BML_OPENMP:-yes}
+export BML_INTERNAL_BLAS=${BML_INTERNAL_BLAS:-no}
+export TESTING_EXTRA_ARGS=${TESTING_EXTRA_ARGS:-"-R fortran-.*-double_real"}
+export BML_VALGRIND=${BML_VALGRIND:-yes}
+
+# [nicolasbock] Valgrind cannot handle a Debug build with valgrind and
+# fails with:
+#
+# parse DIE(readdwarf3.c:3619): confused by:
+#  <2><60e>: Abbrev Number: 25 (DW_TAG_subrange_type)
+#      DW_AT_type        : <42>
+#      DW_AT_upper_bound : 4 byte block: 91 c0 7b 6
+# parse_type_DIE:
+# --18653-- WARNING: Serious error when reading debug info
+# --18653-- When reading debug info from /home/runner/work/bml/bml/build/tests/Fortran-tests/bml-testf:
+# --18653-- confused by the above DIE
+#
+# Bionic ships with valgrind-3.13.0. This issue might be fixed with
+# later versions.
+#
+# Re-review once we have a backport of valgrind for Bionic.
+export CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Release}
+
+[[ -f ${basedir}/scripts/ci-defaults.sh ]] && . ${basedir}/scripts/ci-defaults.sh
+
+${basedir}/build.sh --debug testing

scripts/ci-gcc-4.8-Fortran-single-complex.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+set -e -u -x
+
+basedir=$(readlink --canonicalize $(dirname $0)/..)
+
+export CC=${CC:-gcc-4.8}
+export CXX=${CXX:-g++-4.8}
+export FC=${FC:-gfortran-4.8}
+export BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-no}
+export BML_OPENMP=${BML_OPENMP:-yes}
+export BML_INTERNAL_BLAS=${BML_INTERNAL_BLAS:-no}
+export TESTING_EXTRA_ARGS=${TESTING_EXTRA_ARGS:-"-R fortran-.*-single_complex"}
+export BML_VALGRIND=${BML_VALGRIND:-yes}
+
+# [nicolasbock] Valgrind cannot handle a Debug build with valgrind and
+# fails with:
+#
+# parse DIE(readdwarf3.c:3619): confused by:
+#  <2><60e>: Abbrev Number: 25 (DW_TAG_subrange_type)
+#      DW_AT_type        : <42>
+#      DW_AT_upper_bound : 4 byte block: 91 c0 7b 6
+# parse_type_DIE:
+# --18653-- WARNING: Serious error when reading debug info
+# --18653-- When reading debug info from /home/runner/work/bml/bml/build/tests/Fortran-tests/bml-testf:
+# --18653-- confused by the above DIE
+#
+# Bionic ships with valgrind-3.13.0. This issue might be fixed with
+# later versions.
+#
+# Re-review once we have a backport of valgrind for Bionic.
+export CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Release}
+
+[[ -f ${basedir}/scripts/ci-defaults.sh ]] && . ${basedir}/scripts/ci-defaults.sh
+
+${basedir}/build.sh --debug testing

scripts/ci-gcc-4.8-Fortran-single-real.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+
+set -e -u -x
+
+basedir=$(readlink --canonicalize $(dirname $0)/..)
+
+export CC=${CC:-gcc-4.8}
+export CXX=${CXX:-g++-4.8}
+export FC=${FC:-gfortran-4.8}
+export BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-no}
+export BML_OPENMP=${BML_OPENMP:-yes}
+export BML_INTERNAL_BLAS=${BML_INTERNAL_BLAS:-no}
+export TESTING_EXTRA_ARGS=${TESTING_EXTRA_ARGS:-"-R fortran-.*-single_real"}
+export BML_VALGRIND=${BML_VALGRIND:-yes}
+
+# [nicolasbock] Valgrind cannot handle a Debug build with valgrind and
+# fails with:
+#
+# parse DIE(readdwarf3.c:3619): confused by:
+#  <2><60e>: Abbrev Number: 25 (DW_TAG_subrange_type)
+#      DW_AT_type        : <42>
+#      DW_AT_upper_bound : 4 byte block: 91 c0 7b 6
+# parse_type_DIE:
+# --18653-- WARNING: Serious error when reading debug info
+# --18653-- When reading debug info from /home/runner/work/bml/bml/build/tests/Fortran-tests/bml-testf:
+# --18653-- confused by the above DIE
+#
+# Bionic ships with valgrind-3.13.0. This issue might be fixed with
+# later versions.
+#
+# Re-review once we have a backport of valgrind for Bionic.
+export CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Release}
+
+[[ -f ${basedir}/scripts/ci-defaults.sh ]] && . ${basedir}/scripts/ci-defaults.sh
+
+${basedir}/build.sh --debug testing