Enable override of variables for tests

This change enables override of the environment variables used for CI tests. This change is meant for running the tests locally so that the tests can be modified. For example, in order to test with a new compiler one might run: $ CC=gcc-13 ./scripts/ci-gcc-11-C-single-real.sh to override the default C compiler in test. Signed-off-by: Nicolas Bock <nicolasbock@gmail.com>
lanl · Jul 15, 2021 · 8b621ac · 8b621ac
1 parent eaae21f
commit 8b621ac
Show file tree

Hide file tree

Showing 21 changed files with 201 additions and 201 deletions.
diff --git a/scripts/ci-MPI-double-complex.sh b/scripts/ci-MPI-double-complex.sh
@@ -4,17 +4,17 @@ set -e -u -x
 
 basedir=$(readlink --canonicalize $(dirname $0)/..)
 
-[[ -f ${basedir}/scripts/ci-defaults.sh ]] && . ${basedir}/scripts/ci-defaults.sh
+export CC=${CC:-mpicc}
+export CXX=${CXX:-mpic++}
+export FC=${FC:-mpifort}
+export BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-no}
+export BML_OPENMP=${BML_OPENMP:-no}
+export BML_INTERNAL_BLAS=${BML_INTERNAL_BLAS:-no}
+export BML_MPI=${BML_MPI:-yes}
+export TESTING_EXTRA_ARGS=${TESTING_EXTRA_ARGS:-"-R MPI-C-.*-double_complex"}
+export EXTRA_LINK_FLAGS=${EXTRA_LINK_FLAGS:-"-lscalapack-openmpi"}
+export BML_SCALAPACK=${BML_SCALAPACK:-yes}
 
-export CC=mpicc
-export CXX=mpic++
-export FC=mpifort
-export BUILD_SHARED_LIBS=no
-export BML_OPENMP=no
-export BML_INTERNAL_BLAS=no
-export BML_MPI=yes
-export TESTING_EXTRA_ARGS="-R MPI-C-.*-double_complex"
-export EXTRA_LINK_FLAGS=-lscalapack-openmpi
-export BML_SCALAPACK=yes
+[[ -f ${basedir}/scripts/ci-defaults.sh ]] && . ${basedir}/scripts/ci-defaults.sh
 
 ${basedir}/build.sh --debug testing
diff --git a/scripts/ci-MPI-double-real.sh b/scripts/ci-MPI-double-real.sh
@@ -4,17 +4,17 @@ set -e -u -x
 
 basedir=$(readlink --canonicalize $(dirname $0)/..)
 
-[[ -f ${basedir}/scripts/ci-defaults.sh ]] && . ${basedir}/scripts/ci-defaults.sh
+export CC=${CC:-mpicc}
+export CXX=${CXX:-mpic++}
+export FC=${FC:-mpifort}
+export BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-no}
+export BML_OPENMP=${BML_OPENMP:-no}
+export BML_INTERNAL_BLAS=${BML_INTERNAL_BLAS:-no}
+export BML_MPI=${BML_MPI:-yes}
+export TESTING_EXTRA_ARGS=${TESTING_EXTRA_ARGS:-"-R MPI-C-.*-double_real"}
+export EXTRA_LINK_FLAGS=${EXTRA_LINK_FLAGS:-"-lscalapack-openmpi"}
+export BML_SCALAPACK=${BML_SCALAPACK:-yes}
 
-export CC=mpicc
-export CXX=mpic++
-export FC=mpifort
-export BUILD_SHARED_LIBS=no
-export BML_OPENMP=no
-export BML_INTERNAL_BLAS=no
-export BML_MPI=yes
-export TESTING_EXTRA_ARGS="-R MPI-C-.*-double_real"
-export EXTRA_LINK_FLAGS=-lscalapack-openmpi
-export BML_SCALAPACK=yes
+[[ -f ${basedir}/scripts/ci-defaults.sh ]] && . ${basedir}/scripts/ci-defaults.sh
 
 ${basedir}/build.sh --debug testing
diff --git a/scripts/ci-MPI-single-complex.sh b/scripts/ci-MPI-single-complex.sh
@@ -4,17 +4,17 @@ set -e -u -x
 
 basedir=$(readlink --canonicalize $(dirname $0)/..)
 
-[[ -f ${basedir}/scripts/ci-defaults.sh ]] && . ${basedir}/scripts/ci-defaults.sh
+export CC=${CC:-mpicc}
+export CXX=${CXX:-mpic++}
+export FC=${FC:-mpifort}
+export BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-no}
+export BML_OPENMP=${BML_OPENMP:-no}
+export BML_INTERNAL_BLAS=${BML_INTERNAL_BLAS:-no}
+export BML_MPI=${BML_MPI:-yes}
+export TESTING_EXTRA_ARGS=${TESTING_EXTRA_ARGS:-"-R MPI-C-.*-single_complex"}
+export EXTRA_LINK_FLAGS=${EXTRA_LINK_FLAGS:-"-lscalapack-openmpi"}
+export BML_SCALAPACK=${BML_SCALAPACK:-yes}
 
-export CC=mpicc
-export CXX=mpic++
-export FC=mpifort
-export BUILD_SHARED_LIBS=no
-export BML_OPENMP=no
-export BML_INTERNAL_BLAS=no
-export BML_MPI=yes
-export TESTING_EXTRA_ARGS="-R MPI-C-.*-single_complex"
-export EXTRA_LINK_FLAGS=-lscalapack-openmpi
-export BML_SCALAPACK=yes
+[[ -f ${basedir}/scripts/ci-defaults.sh ]] && . ${basedir}/scripts/ci-defaults.sh
 
 ${basedir}/build.sh --debug testing
diff --git a/scripts/ci-MPI-single-real.sh b/scripts/ci-MPI-single-real.sh
@@ -4,17 +4,17 @@ set -e -u -x
 
 basedir=$(readlink --canonicalize $(dirname $0)/..)
 
-[[ -f ${basedir}/scripts/ci-defaults.sh ]] && . ${basedir}/scripts/ci-defaults.sh
+export CC=${CC:-mpicc}
+export CXX=${CXX:-mpic++}
+export FC=${FC:-mpifort}
+export BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-no}
+export BML_OPENMP=${BML_OPENMP:-no}
+export BML_INTERNAL_BLAS=${BML_INTERNAL_BLAS:-no}
+export BML_MPI=${BML_MPI:-yes}
+export TESTING_EXTRA_ARGS=${TESTING_EXTRA_ARGS:-"-R MPI-C-.*-single_real"}
+export EXTRA_LINK_FLAGS=${EXTRA_LINK_FLAGS:-"-lscalapack-openmpi"}
+export BML_SCALAPACK=${BML_SCALAPACK:-yes}
 
-export CC=mpicc
-export CXX=mpic++
-export FC=mpifort
-export BUILD_SHARED_LIBS=no
-export BML_OPENMP=no
-export BML_INTERNAL_BLAS=no
-export BML_MPI=yes
-export TESTING_EXTRA_ARGS="-R MPI-C-.*-single_real"
-export EXTRA_LINK_FLAGS=-lscalapack-openmpi
-export BML_SCALAPACK=yes
+[[ -f ${basedir}/scripts/ci-defaults.sh ]] && . ${basedir}/scripts/ci-defaults.sh
 
 ${basedir}/build.sh --debug testing
diff --git a/scripts/ci-clang-11-gfortran-11-C-double-complex.sh b/scripts/ci-clang-11-gfortran-11-C-double-complex.sh
@@ -4,15 +4,15 @@ set -e -u -x
 
 basedir=$(readlink --canonicalize $(dirname $0)/..)
 
-[[ -f ${basedir}/scripts/ci-defaults.sh ]] && . ${basedir}/scripts/ci-defaults.sh
+export CC=${CC:-clang-11}
+export CXX=${CXX:-clang++-11}
+export FC=${FC:-gfortran-9}
+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_complex"}
+export BML_VALGRIND=${BML_VALGRIND:-yes}
 
-export CC=clang-11
-export CXX=clang++-11
-export FC=gfortran-11
-export BUILD_SHARED_LIBS=no
-export BML_OPENMP=no
-export BML_INTERNAL_BLAS=no
-export TESTING_EXTRA_ARGS="-R C-.*-double_complex"
-export BML_VALGRIND=yes
+[[ -f ${basedir}/scripts/ci-defaults.sh ]] && . ${basedir}/scripts/ci-defaults.sh
 
 ${basedir}/build.sh testing
diff --git a/scripts/ci-clang-11-gfortran-11-C-double-real.sh b/scripts/ci-clang-11-gfortran-11-C-double-real.sh
@@ -4,15 +4,15 @@ set -e -u -x
 
 basedir=$(readlink --canonicalize $(dirname $0)/..)
 
-[[ -f ${basedir}/scripts/ci-defaults.sh ]] && . ${basedir}/scripts/ci-defaults.sh
+export CC=${CC:-clang-11}
+export CXX=${CXX:-clang++-11}
+export FC=${FC:-gfortran-9}
+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}
 
-export CC=clang-11
-export CXX=clang++-11
-export FC=gfortran-11
-export BUILD_SHARED_LIBS=no
-export BML_OPENMP=no
-export BML_INTERNAL_BLAS=no
-export TESTING_EXTRA_ARGS="-R C-.*-double_real"
-export BML_VALGRIND=yes
+[[ -f ${basedir}/scripts/ci-defaults.sh ]] && . ${basedir}/scripts/ci-defaults.sh
 
 ${basedir}/build.sh testing
diff --git a/scripts/ci-clang-11-gfortran-11-C-single-complex.sh b/scripts/ci-clang-11-gfortran-11-C-single-complex.sh
@@ -4,15 +4,15 @@ set -e -u -x
 
 basedir=$(readlink --canonicalize $(dirname $0)/..)
 
-[[ -f ${basedir}/scripts/ci-defaults.sh ]] && . ${basedir}/scripts/ci-defaults.sh
+export CC=${CC:-clang-11}
+export CXX=${CXX:-clang++-11}
+export FC=${FC:-gfortran-9}
+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}
 
-export CC=clang-11
-export CXX=clang++-11
-export FC=gfortran-11
-export BUILD_SHARED_LIBS=no
-export BML_OPENMP=no
-export BML_INTERNAL_BLAS=no
-export TESTING_EXTRA_ARGS="-R C-.*-single_complex"
-export BML_VALGRIND=yes
+[[ -f ${basedir}/scripts/ci-defaults.sh ]] && . ${basedir}/scripts/ci-defaults.sh
 
 ${basedir}/build.sh testing
diff --git a/scripts/ci-clang-11-gfortran-11-C-single-real.sh b/scripts/ci-clang-11-gfortran-11-C-single-real.sh
@@ -4,15 +4,15 @@ set -e -u -x
 
 basedir=$(readlink --canonicalize $(dirname $0)/..)
 
-[[ -f ${basedir}/scripts/ci-defaults.sh ]] && . ${basedir}/scripts/ci-defaults.sh
+export CC=${CC:-clang-11}
+export CXX=${CXX:-clang++-11}
+export FC=${FC:-gfortran-9}
+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}
 
-export CC=clang-11
-export CXX=clang++-11
-export FC=gfortran-9
-export BUILD_SHARED_LIBS=no
-export BML_OPENMP=no
-export BML_INTERNAL_BLAS=no
-export TESTING_EXTRA_ARGS="-R C-.*-single_real"
-export BML_VALGRIND=yes
+[[ -f ${basedir}/scripts/ci-defaults.sh ]] && . ${basedir}/scripts/ci-defaults.sh
 
 ${basedir}/build.sh testing
diff --git a/scripts/ci-defaults.sh b/scripts/ci-defaults.sh
@@ -1,13 +1,13 @@
-export CC=gcc
-export CXX=g++
-export FC=gfortran
-export BML_INTERNAL_BLAS=no
-export BML_MPI=no
-export BML_MPIEXEC_NUMPROCS_FLAG=-n
-export BML_MPIEXEC_NUMPROCS=4
-export BML_OPENMP=no
-export BML_VALGRIND=no
-export BML_SCALAPACK=no
-export BUILD_SHARED_LIBS=no
-export VERBOSE_MAKEFILE=yes
-export CMAKE_BUILD_TYPE=Debug
+export CC=${CC:-gcc}
+export CXX=${CXX:-g++}
+export FC=${FC:-gfortran}
+export BML_INTERNAL_BLAS=${BML_INTERNAL_BLAS:-no}
+export BML_MPI=${BML_MPI:-no}
+export BML_MPIEXEC_NUMPROCS_FLAG=${BML_MPIEXEC_NUMPROCS_FLAG:-'-n'}
+export BML_MPIEXEC_NUMPROCS=${BML_MPIEXEC_NUMPROCS:-4}
+export BML_OPENMP=${BML_OPENMP:-no}
+export BML_VALGRIND=${BML_VALGRIND:-no}
+export BML_SCALAPACK=${BML_SCALAPACK:-no}
+export BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-no}
+export VERBOSE_MAKEFILE=${VERBOSE_MAKEFILE:-yes}
+export CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Debug}
diff --git a/scripts/ci-gcc-11-C-double-complex.sh b/scripts/ci-gcc-11-C-double-complex.sh
@@ -4,15 +4,15 @@ set -e -u -x
 
 basedir=$(readlink --canonicalize $(dirname $0)/..)
 
-[[ -f ${basedir}/scripts/ci-defaults.sh ]] && . ${basedir}/scripts/ci-defaults.sh
+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_INTERNAL_BLAS=${BML_INTERNAL_BLAS:-no}
+export TESTING_EXTRA_ARGS=${TESTING_EXTRA_ARGS:-"-R C-.*-double_complex"}
+export BML_VALGRIND=${BML_VALGRIND:-yes}
 
-export CC=gcc-11
-export CXX=g++-11
-export FC=gfortran-11
-export BUILD_SHARED_LIBS=no
-export BML_OPENMP=no
-export BML_INTERNAL_BLAS=no
-export TESTING_EXTRA_ARGS="-R C-.*-double_complex"
-export BML_VALGRIND=yes
+[[ -f ${basedir}/scripts/ci-defaults.sh ]] && . ${basedir}/scripts/ci-defaults.sh
 
 ${basedir}/build.sh --debug testing
diff --git a/scripts/ci-gcc-11-C-double-real.sh b/scripts/ci-gcc-11-C-double-real.sh
@@ -4,15 +4,15 @@ set -e -u -x
 
 basedir=$(readlink --canonicalize $(dirname $0)/..)
 
-[[ -f ${basedir}/scripts/ci-defaults.sh ]] && . ${basedir}/scripts/ci-defaults.sh
+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_INTERNAL_BLAS=${BML_INTERNAL_BLAS:-no}
+export TESTING_EXTRA_ARGS=${TESTING_EXTRA_ARGS:-"-R C-.*-double_real"}
+export BML_VALGRIND=${BML_VALGRIND:-yes}
 
-export CC=gcc-11
-export CXX=g++-11
-export FC=gfortran-11
-export BUILD_SHARED_LIBS=no
-export BML_OPENMP=no
-export BML_INTERNAL_BLAS=no
-export TESTING_EXTRA_ARGS="-R C-.*-double_real"
-export BML_VALGRIND=yes
+[[ -f ${basedir}/scripts/ci-defaults.sh ]] && . ${basedir}/scripts/ci-defaults.sh
 
 ${basedir}/build.sh --debug testing
diff --git a/scripts/ci-gcc-11-C-single-complex.sh b/scripts/ci-gcc-11-C-single-complex.sh
@@ -4,15 +4,15 @@ set -e -u -x
 
 basedir=$(readlink --canonicalize $(dirname $0)/..)
 
-[[ -f ${basedir}/scripts/ci-defaults.sh ]] && . ${basedir}/scripts/ci-defaults.sh
+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_INTERNAL_BLAS=${BML_INTERNAL_BLAS:-no}
+export TESTING_EXTRA_ARGS=${TESTING_EXTRA_ARGS:-"-R C-.*-single_complex"}
+export BML_VALGRIND=${BML_VALGRIND:-yes}
 
-export CC=gcc-11
-export CXX=g++-11
-export FC=gfortran-11
-export BUILD_SHARED_LIBS=no
-export BML_OPENMP=no
-export BML_INTERNAL_BLAS=no
-export TESTING_EXTRA_ARGS="-R C-.*-single_complex"
-export BML_VALGRIND=yes
+[[ -f ${basedir}/scripts/ci-defaults.sh ]] && . ${basedir}/scripts/ci-defaults.sh
 
 ${basedir}/build.sh --debug testing
diff --git a/scripts/ci-gcc-11-C-single-real.sh b/scripts/ci-gcc-11-C-single-real.sh
@@ -4,15 +4,15 @@ set -e -u -x
 
 basedir=$(readlink --canonicalize $(dirname $0)/..)
 
-[[ -f ${basedir}/scripts/ci-defaults.sh ]] && . ${basedir}/scripts/ci-defaults.sh
+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_INTERNAL_BLAS=${BML_INTERNAL_BLAS:-no}
+export TESTING_EXTRA_ARGS=${TESTING_EXTRA_ARGS:-"-R C-.*-single_real"}
+export BML_VALGRIND=${BML_VALGRIND:-yes}
 
-export CC=gcc-11
-export CXX=g++-11
-export FC=gfortran-11
-export BUILD_SHARED_LIBS=no
-export BML_OPENMP=no
-export BML_INTERNAL_BLAS=no
-export TESTING_EXTRA_ARGS="-R C-.*-single_real"
-export BML_VALGRIND=yes
+[[ -f ${basedir}/scripts/ci-defaults.sh ]] && . ${basedir}/scripts/ci-defaults.sh
 
 ${basedir}/build.sh --debug testing
diff --git a/scripts/ci-gcc-11-Fortran-double-complex.sh b/scripts/ci-gcc-11-Fortran-double-complex.sh
@@ -4,16 +4,14 @@ set -e -u -x
 
 basedir=$(readlink --canonicalize $(dirname $0)/..)
 
-[[ -f ${basedir}/scripts/ci-defaults.sh ]] && . ${basedir}/scripts/ci-defaults.sh
-
-export CC=gcc-11
-export CXX=g++-11
-export FC=gfortran-11
-export BUILD_SHARED_LIBS=no
-export BML_OPENMP=no
-export BML_INTERNAL_BLAS=no
-export TESTING_EXTRA_ARGS="-R fortran-.*-double_complex"
-export BML_VALGRIND=yes
+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_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:
@@ -31,6 +29,8 @@ export BML_VALGRIND=yes
 # later versions.
 #
 # Re-review once we have a backport of valgrind for Bionic.
-export CMAKE_BUILD_TYPE=Release
+export CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Release}
+
+[[ -f ${basedir}/scripts/ci-defaults.sh ]] && . ${basedir}/scripts/ci-defaults.sh
 
 ${basedir}/build.sh --debug testing