Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable override of variables for tests #532

Merged
merged 1 commit into from
Jul 15, 2021
+201 −201
Merged

Enable override of variables for tests #532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions scripts/ci-MPI-double-complex.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
22 changes: 11 additions & 11 deletions scripts/ci-MPI-double-real.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
22 changes: 11 additions & 11 deletions scripts/ci-MPI-single-complex.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
22 changes: 11 additions & 11 deletions scripts/ci-MPI-single-real.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
18 changes: 9 additions & 9 deletions scripts/ci-clang-11-gfortran-11-C-double-complex.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
18 changes: 9 additions & 9 deletions scripts/ci-clang-11-gfortran-11-C-double-real.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
18 changes: 9 additions & 9 deletions scripts/ci-clang-11-gfortran-11-C-single-complex.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
18 changes: 9 additions & 9 deletions scripts/ci-clang-11-gfortran-11-C-single-real.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
26 changes: 13 additions & 13 deletions scripts/ci-defaults.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}
18 changes: 9 additions & 9 deletions scripts/ci-gcc-11-C-double-complex.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
18 changes: 9 additions & 9 deletions scripts/ci-gcc-11-C-double-real.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
18 changes: 9 additions & 9 deletions scripts/ci-gcc-11-C-single-complex.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
18 changes: 9 additions & 9 deletions scripts/ci-gcc-11-C-single-real.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
22 changes: 11 additions & 11 deletions scripts/ci-gcc-11-Fortran-double-complex.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Loading