Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~bmribler/hdf5_bmr_cpp3 into develop

6 files changed, 82 insertions, 13 deletions

diff --git a/config/cmake/CTestCustom.cmake b/config/cmake/CTestCustom.cmake
index 0e1eb2e..d5d96bb 100644
--- a/config/cmake/CTestCustom.cmake
+++ b/config/cmake/CTestCustom.cmake
@@ -1,4 +1,9 @@
 set (CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 3000)
+# Allow full output to go to CDash set to 0
+SET(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE 50000)
+SET(CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE 50000)
+# WARNING!  This could be a lot of output and could overwhelm CDash and the
+# MySQL DB so this might not be a good idea!
 
 set (CTEST_CUSTOM_WARNING_EXCEPTION
     ${CTEST_CUSTOM_WARNING_EXCEPTION}
diff --git a/config/cmake/jrunTest.cmake b/config/cmake/jrunTest.cmake
index 0e0106f..67b42fb 100644
--- a/config/cmake/jrunTest.cmake
+++ b/config/cmake/jrunTest.cmake
@@ -25,6 +25,15 @@ if (NOT TEST_REFERENCE)
   message (FATAL_ERROR "Require TEST_REFERENCE to be defined")
 endif ()
 
+if (EXISTS ${TEST_FOLDER}/${TEST_OUTPUT})
+  file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT})
+endif ()
+
+if (EXISTS ${TEST_FOLDER}/${TEST_OUTPUT}.err)
+  file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT}.err)
+endif ()
+
+# if there is not an error reference file add the error output to the stdout file
 if (NOT TEST_ERRREF)
   if (NOT SKIP_APPEND)
     # append error file since skip was not defined
@@ -60,6 +69,7 @@ execute_process (
 
 message (STATUS "COMMAND Result: ${TEST_RESULT}")
 
+# if the .err file exists and ERRROR_APPEND is enabled
 if (EXISTS ${TEST_FOLDER}/${TEST_OUTPUT}.err)
   file (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_STREAM)
   if (TEST_MASK_FILE)
@@ -75,6 +85,7 @@ if (EXISTS ${TEST_FOLDER}/${TEST_OUTPUT}.err)
   endif ()
 endif ()
 
+# if the output file or the .err file needs to mask out error stack info
 if (TEST_MASK_ERROR)
   if (NOT TEST_ERRREF)
     # the error stack has been appended to the output file
@@ -125,7 +136,7 @@ if (NOT TEST_SKIP_COMPARE)
     list (LENGTH test_act len_act)
     file (STRINGS ${TEST_FOLDER}/${TEST_REFERENCE} test_ref)
     list (LENGTH test_ref len_ref)
-    if (NOT ${len_act} STREQUAL "0")
+    if (NOT ${len_act} STREQUAL "0" AND NOT ${len_ref} STREQUAL "0")
       math (EXPR _FP_LEN "${len_ref} - 1")
       foreach (line RANGE 0 ${_FP_LEN})
         list (GET test_act ${line} str_act)
@@ -137,6 +148,13 @@ if (NOT TEST_SKIP_COMPARE)
           endif ()
         endif ()
       endforeach ()
+    else ()
+      if (${len_act} STREQUAL "0")
+        message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_OUTPUT} is empty")
+      endif ()
+      if (${len_ref} STREQUAL "0")
+        message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_REFERENCE} is empty")
+      endif ()
     endif ()
     if (NOT ${len_act} STREQUAL ${len_ref})
       set (TEST_RESULT 1)
@@ -169,7 +187,7 @@ if (NOT TEST_SKIP_COMPARE)
       file (STRINGS ${TEST_FOLDER}/${TEST_ERRREF} test_ref)
       list (LENGTH test_ref len_ref)
       math (EXPR _FP_LEN "${len_ref} - 1")
-      if (NOT ${len_act} STREQUAL "0")
+      if (NOT ${len_act} STREQUAL "0" AND NOT ${len_ref} STREQUAL "0")
         math (EXPR _FP_LEN "${len_ref} - 1")
         foreach (line RANGE 0 ${_FP_LEN})
           list (GET test_act ${line} str_act)
@@ -181,7 +199,14 @@ if (NOT TEST_SKIP_COMPARE)
             endif ()
           endif ()
         endforeach ()
-      endif ()
+      else ()
+        if (${len_act} STREQUAL "0")
+          message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_OUTPUT}.err is empty")
+        endif ()
+        if (${len_ref} STREQUAL "0")
+          message (STATUS "COMPARE Failed: ${TEST_FOLDER}/${TEST_ERRREF} is empty")
+        endif ()
+      endif()
       if (NOT ${len_act} STREQUAL ${len_ref})
         set (TEST_RESULT 1)
       endif ()
diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake
index ecf3be0..3039cfd 100644
--- a/config/cmake_ext_mod/HDFMacros.cmake
+++ b/config/cmake_ext_mod/HDFMacros.cmake
@@ -237,16 +237,18 @@ macro (HDF_README_PROPERTIES target_fortran)
       set (BINARY_PLATFORM "${BINARY_PLATFORM} 10")
     endif ()
     set (BINARY_PLATFORM "${BINARY_PLATFORM} ${MSVC_C_ARCHITECTURE_ID}")
-    if (${CMAKE_C_COMPILER_VERSION} MATCHES "16.*")
+    if (${CMAKE_C_COMPILER_VERSION} MATCHES "^16.*")
       set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2010")
-    elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "15.*")
+    elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^15.*")
       set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2008")
-    elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "17.*")
+    elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^17.*")
       set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2012")
-    elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "18.*")
+    elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^18.*")
       set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2013")
-    elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "19.*")
+    elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^19.*")
       set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2015")
+    elseif (${CMAKE_C_COMPILER_VERSION} MATCHES "^20.*")
+      set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO 2017")
     else ()
       set (BINARY_PLATFORM "${BINARY_PLATFORM}, using VISUAL STUDIO ${CMAKE_C_COMPILER_VERSION}")
     endif ()
diff --git a/hl/tools/h5watch/testh5watch.sh.in b/hl/tools/h5watch/testh5watch.sh.in
index e325377..02f155f 100644
--- a/hl/tools/h5watch/testh5watch.sh.in
+++ b/hl/tools/h5watch/testh5watch.sh.in
@@ -30,9 +30,9 @@ if [[ $rc != 0 ]] ; then
     exit 0
 fi
 
-echo "h5watch tests are skipped temporarily."
-echo
-exit 0
+#echo "h5watch tests are skipped temporarily."
+#echo
+#exit 0
 
 H5WATCH=h5watch               	# The tool name
 H5WATCH_BIN=`pwd`/$H5WATCH    	# The path of H5WATCH
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index c884a05..22accd3 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -64,7 +64,23 @@ New Features
 
     Library:
     --------
-    -
+    - Paged Aggregation
+
+      This is one of the file space management strategies. This strategy
+      aggregates small metadata and raw data allocations into constant-sized
+      well-aligned pages, which are suitable for page caching.  Paged
+      aggregation together with the page buffering feature will allow efficient
+      I/O accesses.
+
+    - Page Buffering
+
+      The page buffering layer in the HDF5 library absorbs small accesses to
+      the file system.  Each page in memory corresponds to a page allocated in
+      the file.  Access to the file system is then performed as a single page
+      or multiple of pages, if they are contiguous.  This ensures that small 
+      accesses to the file system are avoided while providing another caching
+      layer for improved I/O performance.  This feature works in conjunction
+      with the paged aggregation feature.
 
     Parallel Library:
     -----------------
@@ -80,7 +96,10 @@ New Features
 
     Tools:
     ------
-     -
+     - Add options to h5clear:
+       -s: clear the status_flags field in the file's superblock
+       -m: Remove the metadata cache image from the file
+       (Pull Request #361 QK 2017/03/22)
 
     High-Level APIs:
     ---------------
@@ -108,6 +127,22 @@ Bug Fixes since HDF5-1.10.0-patch1 release
     - Changed the plugins dlopen option from RTLD_NOW to RTLD_LAZY
       (PR 201 ADB 2016/12/12)
 
+    - Fix error when copying dataset with attribute which is a compound datatype
+      consisting of a variable length string.
+      (HDFFV-7991 VC 2016/08/19, 2016/08/21, 2016/08/24)
+
+    - H5DOappend will not fail if a dataset has no append callback registered.
+      (HDFFV-9960 VC 2016/08/05, 2016/08/14)
+
+    - Fix the problem where the committed datatype's file location is different
+      from the file location of an attribute with that committed datatype.
+      (HDFFV-9940 VC 2016/07/03, 2016/07/06)
+
+    - (a) Throw an error instead of assertion when v1 btree level hits the 1 byte limit.
+      (b) Modifications to better handle error recovery when conversion by 
+          h5format_convert fails.
+      (HDFFV-9434 VC 2016/05/29)
+
     Configuration
     -------------
     - Configuration will check for the strtoll and strtoull functions
diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h
index 1f8299b..a724394 100644
--- a/src/H5ACprivate.h
+++ b/src/H5ACprivate.h
@@ -453,6 +453,8 @@ H5_DLL herr_t H5AC_load_cache_image_on_next_protect(H5F_t *f, haddr_t addr,
 H5_DLL herr_t H5AC_validate_cache_image_config(H5AC_cache_image_config_t *config_ptr);
 H5_DLL hbool_t H5AC_cache_image_pending(const H5F_t *f);
 H5_DLL herr_t H5AC_force_cache_image_load(H5F_t * f, hid_t dxpl_id);
+H5_DLL herr_t H5AC_get_mdc_image_info(H5AC_t *cache_ptr, haddr_t *image_addr,
+    hsize_t *image_len);
 
 /* Tag & Ring routines */
 H5_DLL herr_t H5AC_tag(hid_t dxpl_id, haddr_t metadata_tag, haddr_t *prev_tag);