From f10714ca68795099f19181f0790f26cb9283b342 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Sun, 26 Jan 2020 10:50:06 -0600
Subject: Correct ignore warnings and use only clang for sanitizers

---
 config/cmake/CTestCustom.cmake    | 26 ++++----------------------
 config/sanitizer/sanitizers.cmake |  2 +-
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/config/cmake/CTestCustom.cmake b/config/cmake/CTestCustom.cmake
index 7ee5737..dfead16 100644
--- a/config/cmake/CTestCustom.cmake
+++ b/config/cmake/CTestCustom.cmake
@@ -21,14 +21,16 @@ set (CTEST_CUSTOM_WARNING_EXCEPTION
 #    "H5detect.c.[0-9]+.[ \t]*:[ \t]*warning C4090:"
 #    "H5detect.c.[0-9]+.[ \t]*:[ \t]*warning:[ \t]*passing argument"
 #    "H5detect.c[0-9 \t:]*warning:[ \t]*passing argument"
-#    "note.*expected.*void.*but argument is of type.*volatile"
+    "note.*expected.*void.*but argument is of type.*volatile"
 #    "H5Tconv.c[0-9 \t:]*warning:[ \t]*comparison is always false due to limited range of data type"
 #    "H5Ztrans.c.[0-9]+.[ \t]*:[ \t]*warning C4244"
-#    "SZIP.src.*:[ \t]*warning"
+    "src.ZLIB.*:[ \t]*warning"
+    "src.SZIP.*:[ \t]*warning"
 #    "POSIX name for this item is deprecated"
     "disabling jobserver mode"
     "config.cmake.xlatefile.c"
 #    "warning.*implicit declaration of function"
+    "warning.*unknown pragma"
 #    "note: expanded from macro"
 #    "fpp:[ \t]*warning:[ \t]*cannot remove H5_DEBUG_API - not a predefined macro"
 )
@@ -69,26 +71,6 @@ set (CTEST_CUSTOM_MEMCHECK_IGNORE
     HL_FORTRAN_f90_ex-clear-objects
     ######### tools/h5clear #########
     H5CLEAR-clearall-objects
-    H5CLEAR-copy_h5clear_fsm_persist_equal.h5
-    H5CLEAR-copy_h5clear_fsm_persist_greater.h5
-    H5CLEAR-copy_h5clear_fsm_persist_less.h5
-    H5CLEAR-copy_h5clear_fsm_persist_noclose.h5
-    H5CLEAR-copy_h5clear_fsm_persist_user_equal.h5
-    H5CLEAR-copy_h5clear_fsm_persist_user_greater.h5
-    H5CLEAR-copy_h5clear_fsm_persist_user_less.h5
-    H5CLEAR-copy_h5clear_log_v3.h5
-    H5CLEAR-copy_h5clear_mdc_image.h5
-    H5CLEAR-copy_h5clear_sec2_v0.h5
-    H5CLEAR-copy_h5clear_sec2_v2.h5
-    H5CLEAR-copy_h5clear_sec2_v3.h5
-    H5CLEAR-copy_h5clear_status_noclear.h5
-    H5CLEAR-copy_latest_h5clear_log_v3.h5
-    H5CLEAR-copy_latest_h5clear_sec2_v3.h5
-    H5CLEAR-copy_mod_h5clear_mdc_image.h5
-    H5CLEAR-copy_mod_h5clr_mdc_image2.h5
-    H5CLEAR-copy_orig_h5clear_sec2_v0.h5
-    H5CLEAR-copy_orig_h5clear_sec2_v2.h5
-    H5CLEAR-copy_orig_h5clear_sec2_v3.h5
     H5CLEAR-h5clear_gentest      # does not close ids by design
     ######### tools/h5copy #########
     H5COPY-clearall-objects
diff --git a/config/sanitizer/sanitizers.cmake b/config/sanitizer/sanitizers.cmake
index 7a6c195..2625ec3 100644
--- a/config/sanitizer/sanitizers.cmake
+++ b/config/sanitizer/sanitizers.cmake
@@ -28,7 +28,7 @@ function(append value)
   endforeach(variable)
 endfunction()
 
-if(USE_SANITIZER)
+if(USE_SANITIZER AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
   set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
   append("-fno-omit-frame-pointer" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
-- 
cgit v0.12