From e3c75f6cf718f1103bd92727c1323d555fd1ae16 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Fri, 13 Dec 2019 11:36:09 -0600
Subject: Fix compile and test issues from DT

---
 config/cmake/jrunTest.cmake         | 8 ++++++--
 config/cmake_ext_mod/grepTest.cmake | 4 +++-
 config/cmake_ext_mod/runTest.cmake  | 8 ++++++--
 config/sanitizer/sanitizers.cmake   | 2 ++
 tools/lib/h5tools_dump.c            | 2 +-
 5 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/config/cmake/jrunTest.cmake b/config/cmake/jrunTest.cmake
index e736b7a..ee4517c 100644
--- a/config/cmake/jrunTest.cmake
+++ b/config/cmake/jrunTest.cmake
@@ -126,7 +126,9 @@ if (NOT TEST_SKIP_COMPARE)
   if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE}")
     if (WIN32 OR MINGW)
       configure_file(${TEST_FOLDER}/${TEST_REFERENCE} ${TEST_FOLDER}/${TEST_REFERENCE}.tmp NEWLINE_STYLE CRLF)
-      file(RENAME ${TEST_FOLDER}/${TEST_REFERENCE}.tmp ${TEST_FOLDER}/${TEST_REFERENCE})
+      if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE}.tmp")
+        file(RENAME ${TEST_FOLDER}/${TEST_REFERENCE}.tmp ${TEST_FOLDER}/${TEST_REFERENCE})
+      endif ()
       #file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
       #file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
     endif ()
@@ -190,7 +192,9 @@ if (NOT TEST_SKIP_COMPARE)
   if (TEST_ERRREF)
     if (WIN32 OR MINGW)
       configure_file(${TEST_FOLDER}/${TEST_ERRREF} ${TEST_FOLDER}/${TEST_ERRREF}.tmp NEWLINE_STYLE CRLF)
-      file(RENAME ${TEST_FOLDER}/${TEST_ERRREF}.tmp ${TEST_FOLDER}/${TEST_ERRREF})
+      if (EXISTS "${TEST_FOLDER}/${TEST_ERRREF}.tmp")
+        file(RENAME ${TEST_FOLDER}/${TEST_ERRREF}.tmp ${TEST_FOLDER}/${TEST_ERRREF})
+      endif ()
       #file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM)
       #file (WRITE ${TEST_FOLDER}/${TEST_ERRREF} "${TEST_STREAM}")
     endif ()
diff --git a/config/cmake_ext_mod/grepTest.cmake b/config/cmake_ext_mod/grepTest.cmake
index 78ee0da..a6f1c7f 100644
--- a/config/cmake_ext_mod/grepTest.cmake
+++ b/config/cmake_ext_mod/grepTest.cmake
@@ -100,7 +100,9 @@ if (TEST_ERRREF)
     if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE}")
       if (WIN32 OR MINGW)
         configure_file(${TEST_FOLDER}/${TEST_REFERENCE} ${TEST_FOLDER}/${TEST_REFERENCE}.tmp NEWLINE_STYLE CRLF)
-        file(RENAME ${TEST_FOLDER}/${TEST_REFERENCE}.tmp ${TEST_FOLDER}/${TEST_REFERENCE})
+        if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE}.tmp")
+          file(RENAME ${TEST_FOLDER}/${TEST_REFERENCE}.tmp ${TEST_FOLDER}/${TEST_REFERENCE})
+        endif ()
         #file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
         #file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
       endif ()
diff --git a/config/cmake_ext_mod/runTest.cmake b/config/cmake_ext_mod/runTest.cmake
index 6f633f3..0c4a5a0 100644
--- a/config/cmake_ext_mod/runTest.cmake
+++ b/config/cmake_ext_mod/runTest.cmake
@@ -207,7 +207,9 @@ if (NOT TEST_SKIP_COMPARE)
   if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE}")
     if (WIN32 OR MINGW)
       configure_file(${TEST_FOLDER}/${TEST_REFERENCE} ${TEST_FOLDER}/${TEST_REFERENCE}.tmp NEWLINE_STYLE CRLF)
-      file(RENAME ${TEST_FOLDER}/${TEST_REFERENCE}.tmp ${TEST_FOLDER}/${TEST_REFERENCE})
+      if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE}.tmp")
+        file(RENAME ${TEST_FOLDER}/${TEST_REFERENCE}.tmp ${TEST_FOLDER}/${TEST_REFERENCE})
+      endif ()
       #file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
       #file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
     endif ()
@@ -271,7 +273,9 @@ if (NOT TEST_SKIP_COMPARE)
   if (TEST_ERRREF)
     if (WIN32 OR MINGW)
       configure_file(${TEST_FOLDER}/${TEST_ERRREF} ${TEST_FOLDER}/${TEST_ERRREF}.tmp NEWLINE_STYLE CRLF)
-      file(RENAME ${TEST_FOLDER}/${TEST_ERRREF}.tmp ${TEST_FOLDER}/${TEST_ERRREF})
+      if (EXISTS "${TEST_FOLDER}/${TEST_ERRREF}.tmp")
+        file(RENAME ${TEST_FOLDER}/${TEST_ERRREF}.tmp ${TEST_FOLDER}/${TEST_ERRREF})
+      endif ()
       #file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM)
       #file (WRITE ${TEST_FOLDER}/${TEST_ERRREF} "${TEST_STREAM}")
     endif ()
diff --git a/config/sanitizer/sanitizers.cmake b/config/sanitizer/sanitizers.cmake
index d5f9a0f..7a6c195 100644
--- a/config/sanitizer/sanitizers.cmake
+++ b/config/sanitizer/sanitizers.cmake
@@ -29,6 +29,8 @@ function(append value)
 endfunction()
 
 if(USE_SANITIZER)
+  set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
   append("-fno-omit-frame-pointer" CMAKE_C_FLAGS CMAKE_CXX_FLAGS)
 
   if(UNIX)
diff --git a/tools/lib/h5tools_dump.c b/tools/lib/h5tools_dump.c
index 4a18785..29b443c 100644
--- a/tools/lib/h5tools_dump.c
+++ b/tools/lib/h5tools_dump.c
@@ -3983,6 +3983,7 @@ h5tools_dump_data(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
     h5tool_format_t    string_dataformat;
     h5tool_format_t    outputformat;
     H5R_ref_t         *ref_buf = NULL;
+    h5tools_context_t  datactx = *ctx;            /* print context  */
 
     H5TOOLS_PUSH_STACK();
     H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "enter file=%p", (void*)stream);
@@ -4030,7 +4031,6 @@ h5tools_dump_data(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
 
     if (H5Tget_class(f_type) == H5T_REFERENCE) {
         ctx->indent_level++;
-        h5tools_context_t datactx = *ctx;            /* print context  */
         H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "reference class type");
         if (!H5Tequal(f_type, H5T_STD_REF) && !H5Tequal(f_type, H5T_STD_REF_DSETREG) && !H5Tequal(f_type, H5T_STD_REF_OBJ)) {
             HGOTO_DONE(SUCCEED);
-- 
cgit v0.12