From: Mark Abraham <mark.j.abraham@gmail.com>
Date: Mon, 6 Sep 2021 09:24:00 +0000 (+0000)
Subject: Use latest cmake for ASAN configuration
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=65e9dbd094df8fc44486957f5e4c065a4323d707;p=alexxy%2Fgromacs.git

Use latest cmake for ASAN configuration
---

diff --git a/admin/containers/utility.py b/admin/containers/utility.py
index 55f620ee90..9ae3199681 100644
--- a/admin/containers/utility.py
+++ b/admin/containers/utility.py
@@ -86,7 +86,7 @@ parsers for tools.
     Instead, inherit from it with the *parents* argument to :py:class:`argparse.ArgumentParser`
 """
 
-parser.add_argument('--cmake', nargs='*', type=str, default=['3.16.3', '3.17.2', '3.18.4'], # new minimum required versions
+parser.add_argument('--cmake', nargs='*', type=str, default=['3.16.3', '3.17.2', '3.18.4', '3.21.2'], # new minimum required versions
                     help='Selection of CMake version to provide to base image')
 
 compiler_group = parser.add_mutually_exclusive_group()
diff --git a/admin/gitlab-ci/gromacs.matrix/gromacs.clang-ASAN.gitlab-ci.yml b/admin/gitlab-ci/gromacs.matrix/gromacs.clang-ASAN.gitlab-ci.yml
index 96eb110abe..3b2188401b 100644
--- a/admin/gitlab-ci/gromacs.matrix/gromacs.clang-ASAN.gitlab-ci.yml
+++ b/admin/gitlab-ci/gromacs.matrix/gromacs.clang-ASAN.gitlab-ci.yml
@@ -20,7 +20,7 @@ gromacs:clang-ASAN:configure:
     - .rules:merge-requests
   image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-llvm-11-tsan
   variables:
-    CMAKE: /usr/local/cmake-3.18.4/bin/cmake
+    CMAKE: /usr/local/cmake-3.21.2/bin/cmake
     COMPILER_MAJOR_VERSION: 11
     CMAKE_BUILD_TYPE_OPTIONS: "-DCMAKE_BUILD_TYPE=ASAN"
 
@@ -33,7 +33,7 @@ gromacs:clang-ASAN:build:
     - .rules:merge-requests
   image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-llvm-11-tsan
   variables:
-    CMAKE: /usr/local/cmake-3.18.4/bin/cmake
+    CMAKE: /usr/local/cmake-3.21.2/bin/cmake
   tags:
     - k8s-scilifelab
   needs:
@@ -46,12 +46,17 @@ gromacs:clang-ASAN:test:
     - .rules:merge-requests
   image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-llvm-11-tsan
   variables:
-    CMAKE: /usr/local/cmake-3.18.4/bin/cmake
+    CMAKE: /usr/local/cmake-3.21.2/bin/cmake
     CTEST_RUN_MODE: "ExperimentalMemCheck"
   tags:
     - k8s-scilifelab
   needs:
     - job: gromacs:clang-ASAN:build
+  after_script:
+    - for file in $(compgen -G "build/Testing/Temporary/MemoryChecker*log") ; do
+      echo Error log file for ASAN via ctest $file ;
+      cat $file ;
+      done
 
 gromacs:clang-ASAN:regressiontest:
   extends:
@@ -60,7 +65,7 @@ gromacs:clang-ASAN:regressiontest:
     - .rules:merge-requests
   image: ${CI_REGISTRY}/gromacs/gromacs/ci-ubuntu-20.04-llvm-11-tsan
   variables:
-    CMAKE: /usr/local/cmake-3.18.4/bin/cmake
+    CMAKE: /usr/local/cmake-3.21.2/bin/cmake
   tags:
     - k8s-scilifelab
   needs:
diff --git a/cmake/with_asan_opts.sh b/cmake/with_asan_opts.sh
index 283368c93d..4dee71cfc8 100755
--- a/cmake/with_asan_opts.sh
+++ b/cmake/with_asan_opts.sh
@@ -37,16 +37,6 @@ while [[ "$1" != "--" ]] ; do
     extra_opts="$extra_opts $1"
     shift
 done
-for opt in $ASAN_OPTIONS ; do
-    if [[ "$opt" == log_path=* ]] ; then
-        # CTest gives errors if the file does not exist, but AddressSanitizer
-        # only produces it if it finds issues...
-        log_path="${opt#log_path=}"
-        log_path="${log_path%\"}"
-        log_path="${log_path#\"}"
-        touch ${log_path}.99999
-    fi
-done
 # Suppressions are not currently necessary, but can be introduced like this.
 #path=`dirname $0`
 #export LSAN_OPTIONS="suppressions=$path/../admin/lsan-suppressions.txt"