Merge branch 'develop' into parallel_vds_develop

11 files changed, 321 insertions, 258 deletions

diff --git a/config/cmake/CTestScript.cmake b/config/cmake/CTestScript.cmake
index 0269ba8..0269ba8 100755..100644
--- a/config/cmake/CTestScript.cmake
+++ b/config/cmake/CTestScript.cmake
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake
index 6d1e3ce..459346e 100644
--- a/config/cmake/ConfigureChecks.cmake
+++ b/config/cmake/ConfigureChecks.cmake
@@ -28,15 +28,6 @@ if (HDF5_STRICT_FORMAT_CHECKS)
 endif ()
 MARK_AS_ADVANCED (HDF5_STRICT_FORMAT_CHECKS)
 
-#-----------------------------------------------------------------------------
-# Option for --enable-metadata-trace-file
-#-----------------------------------------------------------------------------
-option (HDF5_METADATA_TRACE_FILE "Enable metadata trace file collection" OFF)
-if (HDF5_METADATA_TRACE_FILE)
-  set (${HDF_PREFIX}_METADATA_TRACE_FILE 1)
-endif ()
-MARK_AS_ADVANCED (HDF5_METADATA_TRACE_FILE)
-
 # ----------------------------------------------------------------------
 # Decide whether the data accuracy has higher priority during data
 # conversions.  If not, some hard conversions will still be prefered even
diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in
index 2ddb740..c42d93a 100644
--- a/config/cmake/H5pubconf.h.in
+++ b/config/cmake/H5pubconf.h.in
@@ -466,9 +466,6 @@
 /* Define to enable internal memory allocation sanity checking. */
 /* #cmakedefine H5_MEMORY_ALLOC_SANITY_CHECK @H5_MEMORY_ALLOC_SANITY_CHECK@ ** Define in CMakeLists.txt */
 
-/* Define if the metadata trace file code is to be compiled in */
-#cmakedefine H5_METADATA_TRACE_FILE @H5_METADATA_TRACE_FILE@
-
 /* Define if we can violate pointer alignment restrictions */
 #cmakedefine H5_NO_ALIGNMENT_RESTRICTIONS @H5_NO_ALIGNMENT_RESTRICTIONS@
 
diff --git a/config/cmake/HDF5_Examples_options.cmake b/config/cmake/HDF5_Examples_options.cmake
index 386e99c..386e99c 100755..100644
--- a/config/cmake/HDF5_Examples_options.cmake
+++ b/config/cmake/HDF5_Examples_options.cmake
diff --git a/config/cmake/libh5cc.in b/config/cmake/libh5cc.in
index f462d56..f462d56 100755..100644
--- a/config/cmake/libh5cc.in
+++ b/config/cmake/libh5cc.in
diff --git a/config/cmake/libhdf5.pc.in b/config/cmake/libhdf5.pc.in
index 4a2ebaa..4a2ebaa 100755..100644
--- a/config/cmake/libhdf5.pc.in
+++ b/config/cmake/libhdf5.pc.in
diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in
index 6a489e7..9a534df 100644
--- a/config/cmake/libhdf5.settings.cmake.in
+++ b/config/cmake/libhdf5.settings.cmake.in
@@ -79,7 +79,6 @@ Parallel Filtered Dataset Writes: @PARALLEL_FILTERED_WRITES@
                      API Tracing: @HDF5_ENABLE_TRACE@
             Using memory checker: @HDF5_ENABLE_USING_MEMCHECKER@
  Memory allocation sanity checks: @HDF5_MEMORY_ALLOC_SANITY_CHECK@
-             Metadata trace file: @METADATATRACEFILE@
           Function Stack Tracing: @HDF5_ENABLE_CODESTACK@
        Strict File Format Checks: @HDF5_STRICT_FORMAT_CHECKS@
     Optimization Instrumentation: @HDF5_Enable_Instrument@
diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake
index 9534b1e..2b0ac81 100755..100644
--- a/config/cmake/scripts/CTestScript.cmake
+++ b/config/cmake/scripts/CTestScript.cmake
@@ -9,261 +9,261 @@
 # If you do not have access to either file, you may request a copy from
 # help@hdfgroup.org.
 #
-cmake_minimum_required (VERSION 3.10)

-########################################################

-# This dashboard is maintained by The HDF Group

-# For any comments please contact cdashhelp@hdfgroup.org

-#

-########################################################

-# -----------------------------------------------------------

-# -- Get environment

-# -----------------------------------------------------------

-if (NOT SITE_OS_NAME)

-  ## machine name not provided - attempt to discover with uname

-  ## -- set hostname

-  ## --------------------------

-  find_program (HOSTNAME_CMD NAMES hostname)

-  exec_program (${HOSTNAME_CMD} ARGS OUTPUT_VARIABLE HOSTNAME)

-  set (CTEST_SITE  "${HOSTNAME}${CTEST_SITE_EXT}")

-  find_program (UNAME NAMES uname)

-  macro (getuname name flag)

-    exec_program ("${UNAME}" ARGS "${flag}" OUTPUT_VARIABLE "${name}")

-  endmacro ()

-

-  getuname (osname -s)

-  getuname (osrel  -r)

-  getuname (cpu    -m)

-  message (STATUS "Dashboard script uname output: ${osname}-${osrel}-${cpu}\n")

-

-  set (CTEST_BUILD_NAME  "${osname}-${osrel}-${cpu}")

-else ()

-  ## machine name provided

-  ## --------------------------

-  if (CMAKE_HOST_UNIX)

-    set (CTEST_BUILD_NAME "${SITE_OS_NAME}-${SITE_OS_VERSION}-${SITE_OS_BITS}-${SITE_COMPILER_NAME}-${SITE_COMPILER_VERSION}")

-  else ()

-    set (CTEST_BUILD_NAME "${SITE_OS_NAME}-${SITE_OS_VERSION}-${SITE_COMPILER_NAME}")

-  endif ()

-endif ()

+cmake_minimum_required (VERSION 3.10)
+########################################################
+# This dashboard is maintained by The HDF Group
+# For any comments please contact cdashhelp@hdfgroup.org
+#
+########################################################
+# -----------------------------------------------------------
+# -- Get environment
+# -----------------------------------------------------------
+if (NOT SITE_OS_NAME)
+  ## machine name not provided - attempt to discover with uname
+  ## -- set hostname
+  ## --------------------------
+  find_program (HOSTNAME_CMD NAMES hostname)
+  exec_program (${HOSTNAME_CMD} ARGS OUTPUT_VARIABLE HOSTNAME)
+  set (CTEST_SITE  "${HOSTNAME}${CTEST_SITE_EXT}")
+  find_program (UNAME NAMES uname)
+  macro (getuname name flag)
+    exec_program ("${UNAME}" ARGS "${flag}" OUTPUT_VARIABLE "${name}")
+  endmacro ()
+
+  getuname (osname -s)
+  getuname (osrel  -r)
+  getuname (cpu    -m)
+  message (STATUS "Dashboard script uname output: ${osname}-${osrel}-${cpu}\n")
+
+  set (CTEST_BUILD_NAME  "${osname}-${osrel}-${cpu}")
+else ()
+  ## machine name provided
+  ## --------------------------
+  if (CMAKE_HOST_UNIX)
+    set (CTEST_BUILD_NAME "${SITE_OS_NAME}-${SITE_OS_VERSION}-${SITE_OS_BITS}-${SITE_COMPILER_NAME}-${SITE_COMPILER_VERSION}")
+  else ()
+    set (CTEST_BUILD_NAME "${SITE_OS_NAME}-${SITE_OS_VERSION}-${SITE_COMPILER_NAME}")
+  endif ()
+endif ()
 if (SITE_BUILDNAME_SUFFIX)
   set (CTEST_BUILD_NAME  "${SITE_BUILDNAME_SUFFIX}-${CTEST_BUILD_NAME}")
 endif ()
 set (BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDNAME:STRING=${CTEST_BUILD_NAME}")
-

-#-----------------------------------------------------------------------------

-# MAC machines need special option

-#-----------------------------------------------------------------------------

-if (APPLE)

-  # Compiler choice

-  execute_process (COMMAND xcrun --find cc OUTPUT_VARIABLE XCODE_CC OUTPUT_STRIP_TRAILING_WHITESPACE)

-  execute_process (COMMAND xcrun --find c++ OUTPUT_VARIABLE XCODE_CXX OUTPUT_STRIP_TRAILING_WHITESPACE)

-  set (ENV{CC} "${XCODE_CC}")

-  set (ENV{CXX} "${XCODE_CXX}")

-

-  set (BUILD_OPTIONS "${BUILD_OPTIONS} -DCTEST_USE_LAUNCHERS:BOOL=ON -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF")

-endif ()

-

-#-----------------------------------------------------------------------------

-set (NEED_REPOSITORY_CHECKOUT 0)

-set (CTEST_CMAKE_COMMAND "\"${CMAKE_COMMAND}\"")

-if (CTEST_USE_TAR_SOURCE)

-  ## Uncompress source if tar file provided

-  ## --------------------------

-  if (WIN32)

-    message (STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} x ${CTEST_DASHBOARD_ROOT}\\${CTEST_USE_TAR_SOURCE}.zip]")

-    execute_process (COMMAND ${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}\\${CTEST_USE_TAR_SOURCE}.zip RESULT_VARIABLE rv)

-  else ()

-    message (STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}/${CTEST_USE_TAR_SOURCE}.tar]")

-    execute_process (COMMAND ${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}/${CTEST_USE_TAR_SOURCE}.tar RESULT_VARIABLE rv)

-  endif ()

-

-  if (NOT rv EQUAL 0)

-    message (STATUS "extracting... [error-(${rv}) clean up]")

-    file (REMOVE_RECURSE "${CTEST_SOURCE_DIRECTORY}")

-    message (FATAL_ERROR "error: extract of ${CTEST_USE_TAR_SOURCE} failed")

-  endif ()

-

-  file (RENAME ${CTEST_DASHBOARD_ROOT}/${CTEST_USE_TAR_SOURCE} ${CTEST_SOURCE_DIRECTORY})

-  set (LOCAL_SKIP_UPDATE "TRUE")

-else ()

-  if (LOCAL_UPDATE)

-    if (CTEST_USE_GIT_SOURCE)

-      find_program (CTEST_GIT_COMMAND NAMES git git.cmd)

-      set (CTEST_GIT_UPDATE_OPTIONS)

-

-      if (NOT EXISTS "${CTEST_SOURCE_DIRECTORY}")

-        set (NEED_REPOSITORY_CHECKOUT 1)

-      endif ()

-

-      if (${NEED_REPOSITORY_CHECKOUT})

-        if (REPOSITORY_BRANCH)

-          set (CTEST_GIT_options "clone \"${REPOSITORY_URL}\" --branch  \"${REPOSITORY_BRANCH}\" --single-branch \"${CTEST_SOURCE_DIRECTORY}\" --recurse-submodules")

-        else ()

-          set (CTEST_GIT_options "clone \"${REPOSITORY_URL}\" \"${CTEST_SOURCE_DIRECTORY}\" --recurse-submodules")

-        endif ()

-        set (CTEST_CHECKOUT_COMMAND "${CTEST_GIT_COMMAND} ${CTEST_GIT_options}")

-      else ()

-        set (CTEST_GIT_options "pull")

-      endif ()

-      set (CTEST_UPDATE_COMMAND "${CTEST_GIT_COMMAND}")

-    else ()

-      ## --------------------------

-      ## use subversion to get source

-      #-----------------------------------------------------------------------------

-      ## cygwin does not handle the find_package() call

-      ## --------------------------

-      set (CTEST_UPDATE_COMMAND "SVNCommand")

-      if (NOT SITE_CYGWIN})

-        find_package (Subversion)

-        set (CTEST_SVN_COMMAND "${Subversion_SVN_EXECUTABLE}")

-        set (CTEST_UPDATE_COMMAND "${Subversion_SVN_EXECUTABLE}")

-      else ()

-        set (CTEST_SVN_COMMAND "/usr/bin/svn")

-        set (CTEST_UPDATE_COMMAND "/usr/bin/svn")

-      endif ()

-

-      if (NOT EXISTS "${CTEST_SOURCE_DIRECTORY}")

-        set (NEED_REPOSITORY_CHECKOUT 1)

-      endif ()

-

-      if (NOT CTEST_REPO_VERSION)

-        set (CTEST_REPO_VERSION "HEAD")

-      endif ()

-      if (${NEED_REPOSITORY_CHECKOUT})

-        set (CTEST_CHECKOUT_COMMAND

-            "\"${CTEST_SVN_COMMAND}\" co ${REPOSITORY_URL} \"${CTEST_SOURCE_DIRECTORY}\" -r ${CTEST_REPO_VERSION}")

-      else ()

-        if (CTEST_REPO_VERSION)

-          set (CTEST_SVN_UPDATE_OPTIONS "-r ${CTEST_REPO_VERSION}")

-        endif ()

-      endif ()

-    endif ()

-  endif ()

-endif ()

-

-#-----------------------------------------------------------------------------

-## Clear the build directory

-## --------------------------

-set (CTEST_START_WITH_EMPTY_BINARY_DIRECTORY TRUE)

-if (NOT EXISTS "${CTEST_BINARY_DIRECTORY}")

-  file (MAKE_DIRECTORY "${CTEST_BINARY_DIRECTORY}")

-else ()

-  ctest_empty_binary_directory (${CTEST_BINARY_DIRECTORY})

-endif ()

-

-# Use multiple CPU cores to build

-include (ProcessorCount)

-ProcessorCount (N)

+
+#-----------------------------------------------------------------------------
+# MAC machines need special option
+#-----------------------------------------------------------------------------
+if (APPLE)
+  # Compiler choice
+  execute_process (COMMAND xcrun --find cc OUTPUT_VARIABLE XCODE_CC OUTPUT_STRIP_TRAILING_WHITESPACE)
+  execute_process (COMMAND xcrun --find c++ OUTPUT_VARIABLE XCODE_CXX OUTPUT_STRIP_TRAILING_WHITESPACE)
+  set (ENV{CC} "${XCODE_CC}")
+  set (ENV{CXX} "${XCODE_CXX}")
+
+  set (BUILD_OPTIONS "${BUILD_OPTIONS} -DCTEST_USE_LAUNCHERS:BOOL=ON -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF")
+endif ()
+
+#-----------------------------------------------------------------------------
+set (NEED_REPOSITORY_CHECKOUT 0)
+set (CTEST_CMAKE_COMMAND "\"${CMAKE_COMMAND}\"")
+if (CTEST_USE_TAR_SOURCE)
+  ## Uncompress source if tar file provided
+  ## --------------------------
+  if (WIN32)
+    message (STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} x ${CTEST_DASHBOARD_ROOT}\\${CTEST_USE_TAR_SOURCE}.zip]")
+    execute_process (COMMAND ${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}\\${CTEST_USE_TAR_SOURCE}.zip RESULT_VARIABLE rv)
+  else ()
+    message (STATUS "extracting... [${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}/${CTEST_USE_TAR_SOURCE}.tar]")
+    execute_process (COMMAND ${CMAKE_EXECUTABLE_NAME} -E tar -xvf ${CTEST_DASHBOARD_ROOT}/${CTEST_USE_TAR_SOURCE}.tar RESULT_VARIABLE rv)
+  endif ()
+
+  if (NOT rv EQUAL 0)
+    message (STATUS "extracting... [error-(${rv}) clean up]")
+    file (REMOVE_RECURSE "${CTEST_SOURCE_DIRECTORY}")
+    message (FATAL_ERROR "error: extract of ${CTEST_USE_TAR_SOURCE} failed")
+  endif ()
+
+  file (RENAME ${CTEST_DASHBOARD_ROOT}/${CTEST_USE_TAR_SOURCE} ${CTEST_SOURCE_DIRECTORY})
+  set (LOCAL_SKIP_UPDATE "TRUE")
+else ()
+  if (LOCAL_UPDATE)
+    if (CTEST_USE_GIT_SOURCE)
+      find_program (CTEST_GIT_COMMAND NAMES git git.cmd)
+      set (CTEST_GIT_UPDATE_OPTIONS)
+
+      if (NOT EXISTS "${CTEST_SOURCE_DIRECTORY}")
+        set (NEED_REPOSITORY_CHECKOUT 1)
+      endif ()
+
+      if (${NEED_REPOSITORY_CHECKOUT})
+        if (REPOSITORY_BRANCH)
+          set (CTEST_GIT_options "clone \"${REPOSITORY_URL}\" --branch  \"${REPOSITORY_BRANCH}\" --single-branch \"${CTEST_SOURCE_DIRECTORY}\" --recurse-submodules")
+        else ()
+          set (CTEST_GIT_options "clone \"${REPOSITORY_URL}\" \"${CTEST_SOURCE_DIRECTORY}\" --recurse-submodules")
+        endif ()
+        set (CTEST_CHECKOUT_COMMAND "${CTEST_GIT_COMMAND} ${CTEST_GIT_options}")
+      else ()
+        set (CTEST_GIT_options "pull")
+      endif ()
+      set (CTEST_UPDATE_COMMAND "${CTEST_GIT_COMMAND}")
+    else ()
+      ## --------------------------
+      ## use subversion to get source
+      #-----------------------------------------------------------------------------
+      ## cygwin does not handle the find_package() call
+      ## --------------------------
+      set (CTEST_UPDATE_COMMAND "SVNCommand")
+      if (NOT SITE_CYGWIN})
+        find_package (Subversion)
+        set (CTEST_SVN_COMMAND "${Subversion_SVN_EXECUTABLE}")
+        set (CTEST_UPDATE_COMMAND "${Subversion_SVN_EXECUTABLE}")
+      else ()
+        set (CTEST_SVN_COMMAND "/usr/bin/svn")
+        set (CTEST_UPDATE_COMMAND "/usr/bin/svn")
+      endif ()
+
+      if (NOT EXISTS "${CTEST_SOURCE_DIRECTORY}")
+        set (NEED_REPOSITORY_CHECKOUT 1)
+      endif ()
+
+      if (NOT CTEST_REPO_VERSION)
+        set (CTEST_REPO_VERSION "HEAD")
+      endif ()
+      if (${NEED_REPOSITORY_CHECKOUT})
+        set (CTEST_CHECKOUT_COMMAND
+            "\"${CTEST_SVN_COMMAND}\" co ${REPOSITORY_URL} \"${CTEST_SOURCE_DIRECTORY}\" -r ${CTEST_REPO_VERSION}")
+      else ()
+        if (CTEST_REPO_VERSION)
+          set (CTEST_SVN_UPDATE_OPTIONS "-r ${CTEST_REPO_VERSION}")
+        endif ()
+      endif ()
+    endif ()
+  endif ()
+endif ()
+
+#-----------------------------------------------------------------------------
+## Clear the build directory
+## --------------------------
+set (CTEST_START_WITH_EMPTY_BINARY_DIRECTORY TRUE)
+if (NOT EXISTS "${CTEST_BINARY_DIRECTORY}")
+  file (MAKE_DIRECTORY "${CTEST_BINARY_DIRECTORY}")
+else ()
+  ctest_empty_binary_directory (${CTEST_BINARY_DIRECTORY})
+endif ()
+
+# Use multiple CPU cores to build
+include (ProcessorCount)
+ProcessorCount (N)
 if (NOT N EQUAL 0)
   if (MAX_PROC_COUNT)
     if (N GREATER MAX_PROC_COUNT)
       set (N ${MAX_PROC_COUNT})
     endif ()
   endif ()
-  if (NOT WIN32)

-    set (CTEST_BUILD_FLAGS -j${N})

-  endif ()

-  set (ctest_test_args ${ctest_test_args} PARALLEL_LEVEL ${N})

-endif ()

-

-#-----------------------------------------------------------------------------

-# Send the main script as a note.

-list (APPEND CTEST_NOTES_FILES

-    "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}"

-    "${CMAKE_CURRENT_LIST_FILE}"

-    "${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake"

-)

-

-#-----------------------------------------------------------------------------

-# Check for required variables.

-# --------------------------

-foreach (req

-    CTEST_CMAKE_GENERATOR

-    CTEST_SITE

-    CTEST_BUILD_NAME

-  )

-  if (NOT DEFINED ${req})

-    message (FATAL_ERROR "The containing script must set ${req}")

-  endif ()

-endforeach ()

-

-#-----------------------------------------------------------------------------

-# Initialize the CTEST commands

-#------------------------------

-if (CMAKE_GENERATOR_TOOLSET)

-  set (CTEST_CONFIGURE_TOOLSET  "-T${CMAKE_GENERATOR_TOOLSET}")

-else ()

-  set (CTEST_CONFIGURE_TOOLSET  "")

-endif()

-if (LOCAL_MEMCHECK_TEST)

-  find_program (CTEST_MEMORYCHECK_COMMAND NAMES valgrind)

-  set (CTEST_CONFIGURE_COMMAND

-      "${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/mccacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_CONFIGURATION_TYPE} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_CONFIGURE_TOOLSET}\" \"${CTEST_SOURCE_DIRECTORY}\""

-  )

-else ()

-  if (LOCAL_COVERAGE_TEST)

-    find_program (CTEST_COVERAGE_COMMAND NAMES gcov)

-  endif ()

-  set (CTEST_CONFIGURE_COMMAND

-      "${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_CONFIGURATION_TYPE} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_CONFIGURE_TOOLSET}\" \"${CTEST_SOURCE_DIRECTORY}\""

-  )

-endif ()

-

-#-----------------------------------------------------------------------------

-## -- set output to english

-set ($ENV{LC_MESSAGES}  "en_EN")

-

-# Print summary information.

-foreach (v

-    CTEST_SITE

-    CTEST_BUILD_NAME

-    CTEST_SOURCE_DIRECTORY

-    CTEST_BINARY_DIRECTORY

-    CTEST_CMAKE_GENERATOR

-    CTEST_CONFIGURATION_TYPE

-    CTEST_GIT_COMMAND

-    CTEST_CHECKOUT_COMMAND

-    CTEST_CONFIGURE_COMMAND

-    CTEST_SCRIPT_DIRECTORY

-    CTEST_USE_LAUNCHERS

-  )

-  set (vars "${vars}  ${v}=[${${v}}]\n")

-endforeach ()

-message (STATUS "Dashboard script configuration:\n${vars}\n")

-

-#-----------------------------------------------------------------------------

-#-----------------------------------------------------------------------------

-  ## NORMAL process

-  ## -- LOCAL_UPDATE updates the source folder from svn

-  ## -- LOCAL_SUBMIT reports to CDash server

-  ## -- LOCAL_SKIP_TEST skips the test process (only builds)

-  ## -- LOCAL_MEMCHECK_TEST executes the Valgrind testing

-  ## -- LOCAL_COVERAGE_TEST executes code coverage process

-  ## --------------------------

-  ctest_start (${MODEL} TRACK ${MODEL})

-  if (LOCAL_UPDATE)

-    ctest_update (SOURCE "${CTEST_SOURCE_DIRECTORY}")

-  endif ()

-  configure_file (${CTEST_SOURCE_DIRECTORY}/config/cmake/CTestCustom.cmake ${CTEST_BINARY_DIRECTORY}/CTestCustom.cmake)

-  ctest_read_custom_files ("${CTEST_BINARY_DIRECTORY}")

-  ctest_configure (BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)

-  if (LOCAL_SUBMIT)

-    ctest_submit (PARTS Update Configure Notes)

-  endif ()

-  if (${res} LESS 0 OR ${res} GREATER 0)

-    file (APPEND ${CTEST_SCRIPT_DIRECTORY}/FailedCTest.txt "Failed Configure: ${res}\n")

-  endif ()

-

-  ctest_build (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND RETURN_VALUE res NUMBER_ERRORS errval)

-  if (LOCAL_SUBMIT)

-    ctest_submit (PARTS Build)

-  endif ()

-  if (${res} LESS 0 OR ${res} GREATER 0 OR ${errval} GREATER 0)

-    file (APPEND ${CTEST_SCRIPT_DIRECTORY}/FailedCTest.txt "Failed ${errval} Build: ${res}\n")

-  endif ()

-

-  if (NOT LOCAL_SKIP_TEST)

-    if (NOT LOCAL_MEMCHECK_TEST)

+  if (NOT WIN32)
+    set (CTEST_BUILD_FLAGS -j${N})
+  endif ()
+  set (ctest_test_args ${ctest_test_args} PARALLEL_LEVEL ${N})
+endif ()
+
+#-----------------------------------------------------------------------------
+# Send the main script as a note.
+list (APPEND CTEST_NOTES_FILES
+    "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}"
+    "${CMAKE_CURRENT_LIST_FILE}"
+    "${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake"
+)
+
+#-----------------------------------------------------------------------------
+# Check for required variables.
+# --------------------------
+foreach (req
+    CTEST_CMAKE_GENERATOR
+    CTEST_SITE
+    CTEST_BUILD_NAME
+  )
+  if (NOT DEFINED ${req})
+    message (FATAL_ERROR "The containing script must set ${req}")
+  endif ()
+endforeach ()
+
+#-----------------------------------------------------------------------------
+# Initialize the CTEST commands
+#------------------------------
+if (CMAKE_GENERATOR_TOOLSET)
+  set (CTEST_CONFIGURE_TOOLSET  "-T${CMAKE_GENERATOR_TOOLSET}")
+else ()
+  set (CTEST_CONFIGURE_TOOLSET  "")
+endif()
+if (LOCAL_MEMCHECK_TEST)
+  find_program (CTEST_MEMORYCHECK_COMMAND NAMES valgrind)
+  set (CTEST_CONFIGURE_COMMAND
+      "${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/mccacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_CONFIGURATION_TYPE} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_CONFIGURE_TOOLSET}\" \"${CTEST_SOURCE_DIRECTORY}\""
+  )
+else ()
+  if (LOCAL_COVERAGE_TEST)
+    find_program (CTEST_COVERAGE_COMMAND NAMES gcov)
+  endif ()
+  set (CTEST_CONFIGURE_COMMAND
+      "${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_CONFIGURATION_TYPE} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_CONFIGURE_TOOLSET}\" \"${CTEST_SOURCE_DIRECTORY}\""
+  )
+endif ()
+
+#-----------------------------------------------------------------------------
+## -- set output to english
+set ($ENV{LC_MESSAGES}  "en_EN")
+
+# Print summary information.
+foreach (v
+    CTEST_SITE
+    CTEST_BUILD_NAME
+    CTEST_SOURCE_DIRECTORY
+    CTEST_BINARY_DIRECTORY
+    CTEST_CMAKE_GENERATOR
+    CTEST_CONFIGURATION_TYPE
+    CTEST_GIT_COMMAND
+    CTEST_CHECKOUT_COMMAND
+    CTEST_CONFIGURE_COMMAND
+    CTEST_SCRIPT_DIRECTORY
+    CTEST_USE_LAUNCHERS
+  )
+  set (vars "${vars}  ${v}=[${${v}}]\n")
+endforeach ()
+message (STATUS "Dashboard script configuration:\n${vars}\n")
+
+#-----------------------------------------------------------------------------
+#-----------------------------------------------------------------------------
+  ## NORMAL process
+  ## -- LOCAL_UPDATE updates the source folder from svn
+  ## -- LOCAL_SUBMIT reports to CDash server
+  ## -- LOCAL_SKIP_TEST skips the test process (only builds)
+  ## -- LOCAL_MEMCHECK_TEST executes the Valgrind testing
+  ## -- LOCAL_COVERAGE_TEST executes code coverage process
+  ## --------------------------
+  ctest_start (${MODEL} TRACK ${MODEL})
+  if (LOCAL_UPDATE)
+    ctest_update (SOURCE "${CTEST_SOURCE_DIRECTORY}")
+  endif ()
+  configure_file (${CTEST_SOURCE_DIRECTORY}/config/cmake/CTestCustom.cmake ${CTEST_BINARY_DIRECTORY}/CTestCustom.cmake)
+  ctest_read_custom_files ("${CTEST_BINARY_DIRECTORY}")
+  ctest_configure (BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
+  if (LOCAL_SUBMIT)
+    ctest_submit (PARTS Update Configure Notes)
+  endif ()
+  if (${res} LESS 0 OR ${res} GREATER 0)
+    file (APPEND ${CTEST_SCRIPT_DIRECTORY}/FailedCTest.txt "Failed Configure: ${res}\n")
+  endif ()
+
+  ctest_build (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND RETURN_VALUE res NUMBER_ERRORS errval)
+  if (LOCAL_SUBMIT)
+    ctest_submit (PARTS Build)
+  endif ()
+  if (${res} LESS 0 OR ${res} GREATER 0 OR ${errval} GREATER 0)
+    file (APPEND ${CTEST_SCRIPT_DIRECTORY}/FailedCTest.txt "Failed ${errval} Build: ${res}\n")
+  endif ()
+
+  if (NOT LOCAL_SKIP_TEST)
+    if (NOT LOCAL_MEMCHECK_TEST)
       if (NOT LOCAL_BATCH_TEST)
         ctest_test (BUILD "${CTEST_BINARY_DIRECTORY}" APPEND ${ctest_test_args} RETURN_VALUE res)
       else ()
diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake
index dd3b17c..dd3b17c 100755..100644
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
diff --git a/config/cmake/scripts/HDF5options.cmake b/config/cmake/scripts/HDF5options.cmake
index d4cc996..d4cc996 100755..100644
--- a/config/cmake/scripts/HDF5options.cmake
+++ b/config/cmake/scripts/HDF5options.cmake
diff --git a/config/cmake/volTest.cmake b/config/cmake/volTest.cmake
new file mode 100644
index 0000000..27da8a5
--- /dev/null
+++ b/config/cmake/volTest.cmake
@@ -0,0 +1,76 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
+# volTest.cmake executes a command and captures the output in a file. Command uses specified VOL.
+# Exit status of command can also be compared.
+
+# arguments checking
+if (NOT TEST_PROGRAM)
+  message (FATAL_ERROR "Require TEST_PROGRAM to be defined")
+endif ()
+if (NOT TEST_FOLDER)
+  message ( FATAL_ERROR "Require TEST_FOLDER to be defined")
+endif ()
+if (NOT TEST_VOL)
+  message (FATAL_ERROR "Require TEST_VOL 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)
+#  set (ERROR_APPEND 1)
+#endif ()
+
+message (STATUS "USING ${TEST_VOL} ON COMMAND: ${TEST_PROGRAM} ${TEST_ARGS}")
+
+set (ENV{HDF5_VOL_CONNECTOR} "${TEST_VOL}")
+
+# run the test program, capture the stdout/stderr and the result var
+execute_process (
+    COMMAND ${TEST_PROGRAM} ${TEST_ARGS}
+    WORKING_DIRECTORY ${TEST_FOLDER}
+    RESULT_VARIABLE TEST_RESULT
+    OUTPUT_FILE ${TEST_OUTPUT}.out
+    ERROR_FILE ${TEST_OUTPUT}.err
+    OUTPUT_VARIABLE TEST_OUT
+    ERROR_VARIABLE TEST_ERROR
+)
+
+message (STATUS "COMMAND Result: ${TEST_RESULT}")
+
+# if the .err file exists and ERRROR_APPEND is enabled
+if (ERROR_APPEND AND EXISTS ${TEST_FOLDER}/${TEST_OUTPUT}.err)
+  file (READ ${TEST_FOLDER}/${TEST_OUTPUT}.err TEST_STREAM)
+  file (APPEND ${TEST_FOLDER}/${TEST_OUTPUT}.out "${TEST_STREAM}")
+endif ()
+
+# if the return value is !=${TEST_EXPECT} bail out
+if (NOT "${TEST_RESULT}" STREQUAL "${TEST_EXPECT}")
+  if (NOT TEST_NOERRDISPLAY)
+    if (EXISTS ${TEST_FOLDER}/${TEST_OUTPUT}.out)
+      file (READ ${TEST_FOLDER}/${TEST_OUTPUT}.out TEST_STREAM)
+    message (STATUS "Output USING ${TEST_VOL}:\n${TEST_STREAM}")
+    endif ()
+  endif ()
+  message (FATAL_ERROR "Failed: Test program ${TEST_PROGRAM} exited != ${TEST_EXPECT}.\n${TEST_ERROR}")
+endif ()
+
+message (STATUS "COMMAND Error: ${TEST_ERROR}")
+
+# everything went fine...
+message ("Passed: The ${TEST_PROGRAM} program used vol ${TEST_VOL}")