diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6f1791c431a44b895a26d9a979fc84469d09d045..ec860e57cac513ec99b95fce494975a654702a96 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -80,6 +80,7 @@ before_script: - export SKIP_STEP=0 - ./autogen.sh - export SKIP_STEP=0 + - source /etc/profile.d/modules.sh && . ./ci_test_scripts/.ci-env-vars diff --git a/ci_test_scripts/.ci-env-vars b/ci_test_scripts/.ci-env-vars index 2381e413f9b1d0418225dd627b3f48e06a17ca87..1320e409e590746d2968b6e02ba1f9c8ac23f571 100644 --- a/ci_test_scripts/.ci-env-vars +++ b/ci_test_scripts/.ci-env-vars @@ -51,8 +51,8 @@ export MKL_GFORTRAN_SCALAPACK_NO_MPI_OMP_BASELINE="-L$MKL_HOME/lib/intel64 -lmkl export MKL_GFORTRAN_SCALAPACK_FCFLAGS_NO_MPI_OMP="-I$MKL_HOME/include/intel64/lp64" export MKL_GFORTRAN_SCALAPACK_LDFLAGS_NO_MPI_OMP="$MKL_GFORTRAN_SCALAPACK_NO_MPI_OMP_BASELINE -Wl,-rpath,$MKL_HOME/lib/intel64" -export ASAN_OPTIONS=suppressions=no_asan_for_mpi.supp,fast_unwind_on_malloc=0 -export LSAN_OPTIONS=suppressions=no_lsan_for_mpi.supp +export ASAN_OPTIONS=suppressions=./ci_test_scripts/no_asan_for_mpi.supp,fast_unwind_on_malloc=0 +export LSAN_OPTIONS=suppressions=./ci_test_scripts/no_lsan_for_mpi.supp fi diff --git a/ci_test_scripts/generate_gitlab_ci_tests.py b/ci_test_scripts/generate_gitlab_ci_tests.py index 578079749311a71f4a6ead1654d9b89ac6d91b4f..7f4df57d369794cffa2e4165b01a038bba592f64 100755 --- a/ci_test_scripts/generate_gitlab_ci_tests.py +++ b/ci_test_scripts/generate_gitlab_ci_tests.py @@ -260,6 +260,7 @@ print(" - echo \"This test will run with matrix size na = $MATRIX_SIZE, nev= $N print(" - export SKIP_STEP=0") print(" - ./autogen.sh") print(" - export SKIP_STEP=0") +print(" - source /etc/profile.d/modules.sh && . ./ci_test_scripts/.ci-env-vars") print("\n\n")