[svn-r19350] Description:

    Bring r19328:19349 from trunk to revise_chunks branch.

Tested on:
    Mac OS X/32 10.6.4 (amazon) w/debug & production
    (h5committest not needed on this branch)

9 files changed, 142 insertions, 65 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7e9ecc6..8401c6e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -477,6 +477,39 @@ IF (HDF5_ENABLE_SZIP_SUPPORT)
 ENDIF (HDF5_ENABLE_SZIP_SUPPORT)
 
 #-----------------------------------------------------------------------------
+# Option for external libraries on windows
+#-----------------------------------------------------------------------------
+IF (WIN32)
+  OPTION (HDF5_PACKAGE_EXTLIBS "CPACK - include external libraries" OFF)
+  IF (BUILD_SHARED_LIBS)
+    FILE (MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${BLDTYPE})
+    
+    IF (HDF5_ENABLE_Z_LIB_SUPPORT AND ZLIB_FOUND)
+      GET_FILENAME_COMPONENT(ZLIB_DLL_NAME ${ZLIB_LIBRARY} NAME_WE)
+      # MESSAGE (STATUS "ZLIB_DLL_NAME: ${ZLIB_DLL_NAME}")
+      GET_FILENAME_COMPONENT(ZLIB_BIN_PATH ${ZLIB_LIBRARY} PATH)
+      # MESSAGE (STATUS "ZLIB_BIN_PATH: ${ZLIB_BIN_PATH}")
+      ADD_CUSTOM_TARGET (ZLIB-Release-Copy ALL
+          COMMAND ${CMAKE_COMMAND} -E copy_if_different ${ZLIB_BIN_PATH}/${ZLIB_DLL_NAME}.dll ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/
+          COMMENT "Copying ${ZLIB_BIN_PATH}/${ZLIB_DLL_NAME}.dll to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/"
+      )
+    ENDIF (HDF5_ENABLE_Z_LIB_SUPPORT AND ZLIB_FOUND)
+    
+    IF (HDF5_ENABLE_SZIP_SUPPORT AND SZIP_FOUND)
+      GET_FILENAME_COMPONENT(SZIP_DLL_NAME ${SZIP_LIBRARY} NAME_WE)
+      # MESSAGE (STATUS "SZIP_DLL_NAME: ${SZIP_DLL_NAME}")
+      GET_FILENAME_COMPONENT(SZIP_BIN_PATH ${SZIP_LIBRARY} PATH)
+      # MESSAGE (STATUS "SZIP_BIN_PATH: ${SZIP_BIN_PATH}")
+      ADD_CUSTOM_TARGET (SZIP-Release-Copy ALL
+          COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SZIP_BIN_PATH}/${SZIP_DLL_NAME}.dll ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/
+          COMMENT "Copying ${SZIP_BIN_PATH}/${SZIP_DLL_NAME}.dll to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/"
+      )
+    ENDIF (HDF5_ENABLE_SZIP_SUPPORT AND SZIP_FOUND)
+    
+  ENDIF (BUILD_SHARED_LIBS)
+ENDIF (WIN32)
+
+#-----------------------------------------------------------------------------
 # Option to use PACKED BITS SUPPORT
 #-----------------------------------------------------------------------------
 OPTION (HDF5_USE_H5DUMP_PACKED_BITS "Use the PACKED BITS feature in h5dump" OFF)
@@ -598,26 +631,74 @@ CONFIGURE_FILE (${HDF5_RESOURCES_DIR}/H5pubconf.h.in ${HDF5_BINARY_DIR}/H5pubcon
 #-----------------------------------------------------------------------------
 IF (NOT HDF5_INSTALL_NO_DEVELOPMENT)
   INSTALL (
-      FILES
-          ${PROJECT_BINARY_DIR}/H5pubconf.h
-      DESTINATION
-          ${HDF5_INSTALL_INCLUDE_DIR}
-      COMPONENT
-          headers
+      FILES ${PROJECT_BINARY_DIR}/H5pubconf.h
+      DESTINATION ${HDF5_INSTALL_INCLUDE_DIR}
+      COMPONENT headers
   )
 ENDIF (NOT HDF5_INSTALL_NO_DEVELOPMENT)
 
 #-----------------------------------------------------------------------------
+# Option for external libraries on windows
+#-----------------------------------------------------------------------------
+IF (NOT HDF5_EXTERNALLY_CONFIGURED)
+  IF (HDF5_PACKAGE_EXTLIBS)
+    IF (HDF5_ENABLE_Z_LIB_SUPPORT AND ZLIB_FOUND)
+      INSTALL (
+          FILES ${ZLIB_INCLUDE_DIR}/zconf.h ${ZLIB_INCLUDE_DIR}/zlib.h
+          DESTINATION ${HDF5_INSTALL_INCLUDE_DIR}
+          COMPONENT headers
+      )
+      INSTALL(
+          FILES ${ZLIB_LIBRARY}
+          DESTINATION ${HDF5_INSTALL_LIB_DIR}
+          COMPONENT libraries
+      )
+      IF (BUILD_SHARED_LIBS)
+        GET_FILENAME_COMPONENT(ZLIB_DLL_NAME ${ZLIB_LIBRARY} NAME_WE)
+        # message(STATUS "ZLIB_DLL_NAME: ${ZLIB_DLL_NAME}")
+        GET_FILENAME_COMPONENT(ZLIB_BIN_PATH ${ZLIB_LIBRARY} PATH)
+        # message(STATUS "ZLIB_BIN_PATH: ${ZLIB_BIN_PATH}")
+        INSTALL(
+            FILES ${ZLIB_BIN_PATH}/${ZLIB_DLL_NAME}.dll
+            DESTINATION ${HDF5_INSTALL_BIN_DIR}
+            COMPONENT libraries
+        )
+      ENDIF (BUILD_SHARED_LIBS)
+    ENDIF (HDF5_ENABLE_Z_LIB_SUPPORT AND ZLIB_FOUND)
+    IF (HDF5_ENABLE_SZIP_SUPPORT AND SZIP_FOUND)
+      INSTALL (
+          FILES ${SZIP_INCLUDE_DIR}/SZconfig.h ${SZIP_INCLUDE_DIR}/szlib.h ${SZIP_INCLUDE_DIR}/szip_adpt.h ${SZIP_INCLUDE_DIR}/ricehdf.h
+          DESTINATION ${HDF5_INSTALL_INCLUDE_DIR}
+          COMPONENT headers
+      )
+      INSTALL(
+          FILES ${SZIP_LIBRARY}
+          DESTINATION ${HDF5_INSTALL_LIB_DIR}
+          COMPONENT libraries
+      )
+      IF (BUILD_SHARED_LIBS)
+        GET_FILENAME_COMPONENT(SZIP_DLL_NAME ${SZIP_LIBRARY} NAME_WE)
+        # message(STATUS "SZIP_DLL_NAME: ${SZIP_DLL_NAME}")
+        GET_FILENAME_COMPONENT(SZIP_BIN_PATH ${SZIP_LIBRARY} PATH)
+        # message(STATUS "SZIP_BIN_PATH: ${ZLIB_BIN_PATH}")
+        INSTALL(
+            FILES ${SZIP_BIN_PATH}/${SZIP_DLL_NAME}.dll
+            DESTINATION ${HDF5_INSTALL_BIN_DIR}
+            COMPONENT libraries
+        )
+      ENDIF (BUILD_SHARED_LIBS)
+    ENDIF (HDF5_ENABLE_SZIP_SUPPORT AND SZIP_FOUND)
+  ENDIF (HDF5_PACKAGE_EXTLIBS)
+ENDIF (NOT HDF5_EXTERNALLY_CONFIGURED)
+
+#-----------------------------------------------------------------------------
 # Add Target(s) to CMake Install for import into other projects
 #-----------------------------------------------------------------------------
 IF (NOT HDF5_EXTERNALLY_CONFIGURED)
   INSTALL (
-      EXPORT
-          ${HDF5_EXPORTED_TARGETS}
-      DESTINATION
-          lib/cmake/hdf5-${HDF5_PACKAGE_VERSION}
-      FILE
-          hdf5-targets.cmake
+      EXPORT ${HDF5_EXPORTED_TARGETS}
+      DESTINATION lib/cmake/hdf5-${HDF5_PACKAGE_VERSION}
+      FILE hdf5-targets.cmake
   )
 ENDIF (NOT HDF5_EXTERNALLY_CONFIGURED)
 
@@ -626,10 +707,8 @@ ENDIF (NOT HDF5_EXTERNALLY_CONFIGURED)
 #-----------------------------------------------------------------------------
 IF (NOT HDF5_EXTERNALLY_CONFIGURED)
   EXPORT (
-      TARGETS
-          ${HDF5_LIBRARIES_TO_EXPORT} ${HDF5_LIB_DEPENDENCIES}
-      FILE
-          hdf5-targets.cmake
+      TARGETS ${HDF5_LIBRARIES_TO_EXPORT} ${HDF5_LIB_DEPENDENCIES}
+      FILE hdf5-targets.cmake
   )
 ENDIF (NOT HDF5_EXTERNALLY_CONFIGURED)
 
@@ -658,10 +737,8 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED)
       ${HDF5_BINARY_DIR}/CMakeFiles/hdf5-config.cmake @ONLY
   )
   INSTALL (
-      FILES
-          ${HDF5_BINARY_DIR}/CMakeFiles/hdf5-config.cmake
-      DESTINATION
-          lib/cmake/hdf5-${HDF5_PACKAGE_VERSION}
+      FILES ${HDF5_BINARY_DIR}/CMakeFiles/hdf5-config.cmake
+      DESTINATION lib/cmake/hdf5-${HDF5_PACKAGE_VERSION}
   )
 ENDIF (NOT HDF5_EXTERNALLY_CONFIGURED)
 
@@ -674,10 +751,8 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED)
       ${HDF5_BINARY_DIR}/CMakeFiles/hdf5-config-version.cmake @ONLY
   )
   INSTALL (
-      FILES
-          ${HDF5_BINARY_DIR}/CMakeFiles/hdf5-config-version.cmake
-      DESTINATION
-          lib/cmake/hdf5-${HDF5_PACKAGE_VERSION}
+      FILES ${HDF5_BINARY_DIR}/CMakeFiles/hdf5-config-version.cmake
+      DESTINATION lib/cmake/hdf5-${HDF5_PACKAGE_VERSION}
   )
 ENDIF (NOT HDF5_EXTERNALLY_CONFIGURED)
 
@@ -702,7 +777,7 @@ IF (NOT HDF5_EXTERNALLY_CONFIGURED AND EXISTS "${HDF5_SOURCE_DIR}/release_docs")
   #---------------------------------------------------------------------------
   # Now list the cpack commands
   #---------------------------------------------------------------------------
-  CPACK_ADD_COMPONENT (applications 
+  CPACK_ADD_COMPONENT (hdfapplications 
       DISPLAY_NAME "HDF5 Applications" 
       DEPENDS libraries
       GROUP Applications
diff --git a/c++/examples/CMakeLists.txt b/c++/examples/CMakeLists.txt
index 75644a8..c5024f5 100644
--- a/c++/examples/CMakeLists.txt
+++ b/c++/examples/CMakeLists.txt
@@ -34,4 +34,7 @@ FOREACH (example ${examples})
     ENDIF (MSVC)
   ENDIF (WIN32)
   TARGET_LINK_LIBRARIES (cpp_ex_${example} ${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET})
+
+  ADD_TEST (NAME cpp_ex_${example} COMMAND $<TARGET_FILE:cpp_ex_${example}>)
+
 ENDFOREACH (example ${examples})
diff --git a/config/cmake/CTestCustom.ctest b/config/cmake/CTestCustom.ctest
index d55a559..c1538c0 100755
--- a/config/cmake/CTestCustom.ctest
+++ b/config/cmake/CTestCustom.ctest
@@ -2,8 +2,8 @@ SET (CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 1500)
  
 SET (CTEST_CUSTOM_WARNING_EXCEPTION
     ${CTEST_CUSTOM_WARNING_EXCEPTION}
-    "H5detect.c.[0-9]+. : warning C4090:"
-    "testhdf5.h.[0-9]+. : warning C4005:"
+    "H5detect.c.[0-9]+.[ ]*: warning C4090:"
+    "testhdf5.h.[0-9]+.[ ]*: warning C4005:"
     "disabling jobserver mode"
 )
  
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake
index 3a16856..1318e90 100644
--- a/config/cmake/ConfigureChecks.cmake
+++ b/config/cmake/ConfigureChecks.cmake
@@ -563,8 +563,6 @@ ENDIF (INLINE_TEST___inline__)
 # Check how to print a Long Long integer
 #-----------------------------------------------------------------------------
 IF (NOT H5_PRINTF_LL_WIDTH OR H5_PRINTF_LL_WIDTH MATCHES "unknown")
-  SET (H5_PRINTF_LL_WIDTH "H5_PRINTF_LL_WIDTH")
-  IF (H5_PRINTF_LL_WIDTH MATCHES "^H5_PRINTF_LL_WIDTH$")
     SET (PRINT_LL_FOUND 0)
     MESSAGE (STATUS "Checking for appropriate format for 64 bit long:")
     FOREACH (HDF5_PRINTF_LL l64 l L q I64 ll)
@@ -600,7 +598,6 @@ IF (NOT H5_PRINTF_LL_WIDTH OR H5_PRINTF_LL_WIDTH MATCHES "unknown")
           "Width for printf for type `long long' or `__int64', us. `ll"
       )
     ENDIF (PRINT_LL_FOUND)
-  ENDIF (H5_PRINTF_LL_WIDTH MATCHES "^H5_PRINTF_LL_WIDTH$")
 ENDIF (NOT H5_PRINTF_LL_WIDTH OR H5_PRINTF_LL_WIDTH MATCHES "unknown")
 
 # ----------------------------------------------------------------------
diff --git a/hl/c++/examples/CMakeLists.txt b/hl/c++/examples/CMakeLists.txt
index 2a06b9c..0205309 100644
--- a/hl/c++/examples/CMakeLists.txt
+++ b/hl/c++/examples/CMakeLists.txt
@@ -30,6 +30,8 @@ IF (HDF5_BUILD_EXAMPLES)
       ${HDF5_LIB_TARGET}
   )
 
+  ADD_TEST (NAME cpp_hl_ex_ptExampleFL COMMAND $<TARGET_FILE:ptExampleFL>)
+
   ADD_EXECUTABLE (ptExampleVL ${HDF5_HL_CPP_EXAMPLES_SOURCE_DIR}/ptExampleVL.cpp)
   H5_NAMING (ptExampleVL)
   IF (WIN32)
@@ -48,4 +50,7 @@ IF (HDF5_BUILD_EXAMPLES)
       ${HDF5_HL_LIB_TARGET}
       ${HDF5_LIB_TARGET}
   )
+
+  ADD_TEST (NAME cpp_hl_ex_ptExampleVL COMMAND $<TARGET_FILE:ptExampleVL>)
+
 ENDIF (HDF5_BUILD_EXAMPLES)
diff --git a/hl/src/H5LTanalyze.c b/hl/src/H5LTanalyze.c
index 9e9eec2..767dfd7 100644
--- a/hl/src/H5LTanalyze.c
+++ b/hl/src/H5LTanalyze.c
@@ -15,8 +15,8 @@
 
 /*
  * This file was generated by Lex with the command "lex -PH5LTyy -oH5LTanalyze.c H5LTanalyze.l".
- * Do NOT modify it by hand, but in line 52, "#ifndef _WIN32" should be added because
- * Windows doesn't have unistd.h header file.
+ * Do NOT modify it by hand, but in line 52, "#ifdef H5_HAVE_UNISTD_H" should be added if
+ * the platform doesn't have the unistd.h header file.
  */
 
 #define yy_create_buffer H5LTyy_create_buffer
@@ -49,7 +49,7 @@
 #define YY_FLEX_MINOR_VERSION 5
 
 #include <stdio.h>
-#ifndef _WIN32
+#ifdef H5_HAVE_UNISTD_H
 #include <unistd.h>
 #endif
 
diff --git a/release_docs/INSTALL_Windows.txt b/release_docs/INSTALL_Windows.txt
index 7344006..243ccba 100644
--- a/release_docs/INSTALL_Windows.txt
+++ b/release_docs/INSTALL_Windows.txt
@@ -36,7 +36,8 @@ Preconditions:
 
    1. Installed Microsoft Visual Studio.  This document is written for Visual
       Studio 2008. We no longer support building HDF5 using Microsoft Visual 
-      Studio .NET 2003 or 2005.
+      Studio .NET 2003 or 2005. Express Editions may work with the project files
+      but not from the command line. We do not support the Express Editions.
    
    2. (Optional) Installed Intel Compiler 10.1 or 11.1 if you want to build HDF5 
       Fortran libraries. We no longer support Intel Fortran Compiler 9.1.
@@ -61,13 +62,12 @@ Preconditions:
                 Click the "Miscellaneous" tab and uncheck "TAR file smart CR/LF 
                 conversion" option, then click OK.
 
-   4. CMake is available for this release on a experimental basis. CMake 2.8.1
-      can be downloaded from the KitWare website at http://www.kitware.com.
+   4. CMake is available for this release. CMake 2.8.2 can be downloaded from
+      the KitWare website at http://www.kitware.com.
       
       Note: We have attempted to mirror our Autoconf configuration files for
-            maintainence reasons. We are still working out the problems with
-            some issues like fortran shared libraries and tools testing. We
-            will maintain the current VS2008 project files for the 1.8 product.
+            maintainence reasons. We are still working to synchronize the
+            configuration files.
             
    5. Set up a directory structure to unpack the library.  For example:
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 6d9dee7..bbf7894 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -83,8 +83,9 @@ SET (HDF5_REFERENCE_TEST_FILES
     family_v16_00001.h5
     family_v16_00002.h5
     family_v16_00003.h5
+    filespace_1_6.h5
+    filespace_1_8.h5
     fill_old.h5
-    fixed_idx.h5
     group_old.h5
     le_data.h5
     le_extlink1.h5
@@ -101,6 +102,7 @@ SET (HDF5_REFERENCE_TEST_FILES
     tlayouto.h5
     tmtimen.h5
     tmtimeo.h5
+    tsizeslheap.h5
     vms_data.h5
 )
 
diff --git a/testpar/t_rank_projection.c b/testpar/t_rank_projection.c
index c17f7b9..dd73e49 100644
--- a/testpar/t_rank_projection.c
+++ b/testpar/t_rank_projection.c
@@ -22,6 +22,9 @@
 
 #define H5S_PACKAGE             /*suppress error about including H5Spkg   */
 
+/* Define this macro to indicate that the testing APIs should be available */
+#define H5S_TESTING
+
 
 #include "hdf5.h"
 #include "H5private.h"
@@ -47,7 +50,7 @@
 #define PAR_SS_DR_MAX_RANK	5
 #define CONTIG_HYPERSLAB_DR_PIO_TEST__RUN_TEST__DEBUG 0
 
-void
+static void
 contig_hyperslab_dr_pio_test__run_test(const int test_num,
                                        const int edge_size,
                                        const int chunk_edge_size,
@@ -56,11 +59,13 @@ contig_hyperslab_dr_pio_test__run_test(const int test_num,
                                        const hbool_t use_collective_io,
                                        const hid_t dset_type)
 {
-    const char *fcnName = "contig_hyperslab_dr_pio_test()";
+#if CONTIG_HYPERSLAB_DR_PIO_TEST__RUN_TEST__DEBUG 
+    const char *fcnName = "contig_hyperslab_dr_pio_test__run_test()";
+#endif /* CONTIG_HYPERSLAB_DR_PIO_TEST__RUN_TEST__DEBUG */
     const char *filename;
     hbool_t	use_gpfs = FALSE;   /* Use GPFS hints */
     hbool_t	mis_match = FALSE;
-    int		i, j, k, l, m, n;
+    int		i, j, k, l, n;
     int         mrc;
     int		mpi_size = -1;
     int         mpi_rank = -1;
@@ -1619,7 +1624,6 @@ contig_hyperslab_dr_pio_test__run_test(const int test_num,
 void
 contig_hyperslab_dr_pio_test(void)
 {
-    const char *fcnName = "contig_hyperslab_dr_pio_test()";
     int	        test_num = 0;
     int		edge_size = 10;
     int		chunk_edge_size = 0;
@@ -1645,7 +1649,6 @@ contig_hyperslab_dr_pio_test(void)
                                                        (hbool_t)use_collective_io,
                                                        dset_type);
                 test_num++;
-#if 1
                 chunk_edge_size = 5;
                 contig_hyperslab_dr_pio_test__run_test(test_num,
                                                        edge_size,
@@ -1655,7 +1658,6 @@ contig_hyperslab_dr_pio_test(void)
                                                        (hbool_t)use_collective_io,
                                                        dset_type);
                 test_num++;
-#endif
             }
         }
     }
@@ -2068,7 +2070,6 @@ checker_board_hyperslab_dr_pio_test__select_checker_board(
 
 static hbool_t
 checker_board_hyperslab_dr_pio_test__verify_data(uint32_t * buf_ptr,
-                                                 const int mpi_rank,
                                                  const int rank,
                                                  const int edge_size,
                                                  const int checker_edge_size,
@@ -2097,12 +2098,17 @@ checker_board_hyperslab_dr_pio_test__verify_data(uint32_t * buf_ptr,
     HDassert( test_max_rank <= PAR_SS_DR_MAX_RANK );
 
 #if CHECKER_BOARD_HYPERSLAB_DR_PIO_TEST__VERIFY_DATA__DEBUG 
+
+    int		mpi_rank;
+
+    MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
     HDfprintf(stdout, "%s mpi_rank = %d.\n", fcnName, mpi_rank);
     HDfprintf(stdout, "%s rank = %d.\n", fcnName, rank);
     HDfprintf(stdout, "%s edge_size = %d.\n", fcnName, edge_size);
     HDfprintf(stdout, "%s checker_edge_size = %d.\n", fcnName, checker_edge_size);
     HDfprintf(stdout, "%s first_expected_val = %d.\n", fcnName, (int)first_expected_val);
     HDfprintf(stdout, "%s starts_in_checker = %d.\n", fcnName, (int)buf_starts_in_checker);
+}
 #endif
 
     val_ptr = buf_ptr;
@@ -2248,12 +2254,14 @@ checker_board_hyperslab_dr_pio_test__run_test(const int test_num,
                                               const hbool_t use_collective_io,
                                               const hid_t dset_type)
 {
+#if CHECKER_BOARD_HYPERSLAB_DR_PIO_TEST__RUN_TEST__DEBUG
     const char *fcnName = "checker_board_hyperslab_dr_pio_test__run_test()";
+#endif /* CHECKER_BOARD_HYPERSLAB_DR_PIO_TEST__RUN_TEST__DEBUG */
     const char *filename;
     hbool_t	use_gpfs = FALSE;   /* Use GPFS hints */
     hbool_t	data_ok = FALSE;
     hbool_t	mis_match = FALSE;
-    int		i, j, k, l, m, n;
+    int		i, j, k, l, n;
     int         mrc;
     int         start_index;
     int         stop_index;
@@ -2308,10 +2316,6 @@ checker_board_hyperslab_dr_pio_test__run_test(const int test_num,
     hsize_t     count[PAR_SS_DR_MAX_RANK];
     hsize_t     block[PAR_SS_DR_MAX_RANK];
     hsize_t     sel_start[PAR_SS_DR_MAX_RANK];
-    hsize_t   * start_ptr = NULL;
-    hsize_t   * stride_ptr = NULL;
-    hsize_t   * count_ptr = NULL;
-    hsize_t   * block_ptr = NULL;
     htri_t      check;          /* Shape comparison return value */
     herr_t	ret;		/* Generic return value */
 
@@ -2357,13 +2361,6 @@ checker_board_hyperslab_dr_pio_test__run_test(const int test_num,
     HDassert( large_ds_offset < PAR_SS_DR_MAX_RANK );
 
 
-    /* set up the start, stride, count, and block pointers */
-    start_ptr  = &(start[PAR_SS_DR_MAX_RANK - large_rank]);
-    stride_ptr = &(stride[PAR_SS_DR_MAX_RANK - large_rank]);
-    count_ptr  = &(count[PAR_SS_DR_MAX_RANK - large_rank]);
-    block_ptr  = &(block[PAR_SS_DR_MAX_RANK - large_rank]);
-
-
     /* Allocate buffers */
     small_ds_buf_0 = (uint32_t *)HDmalloc(sizeof(uint32_t) * small_ds_size);
     VRFY((small_ds_buf_0 != NULL), "malloc of small_ds_buf_0 succeeded");
@@ -3020,7 +3017,6 @@ checker_board_hyperslab_dr_pio_test__run_test(const int test_num,
                 data_ok = checker_board_hyperslab_dr_pio_test__verify_data
                           (
                             small_ds_slice_buf,
-                            mpi_rank,
                             small_rank - 1,
                             edge_size,
                             checker_edge_size,
@@ -3221,6 +3217,8 @@ checker_board_hyperslab_dr_pio_test__run_test(const int test_num,
                 stop_index = start_index + (int)small_ds_slice_size - 1;
 
 #if CHECKER_BOARD_HYPERSLAB_DR_PIO_TEST__RUN_TEST__DEBUG 
+{
+int		m;
 		HDfprintf(stdout, "%s:%d: expected_value = %d.\n", 
                           fcnName, mpi_rank, expected_value);
 		HDfprintf(stdout, "%s:%d: start/stop index = %d/%d.\n",
@@ -3238,6 +3236,7 @@ checker_board_hyperslab_dr_pio_test__run_test(const int test_num,
                 HDfprintf(stdout, "\n");
                 fsync(stdout);
                 ptr_1 = large_ds_buf_1;
+}
 #endif 
 
                 HDassert( 0 <= start_index );
@@ -3263,7 +3262,6 @@ checker_board_hyperslab_dr_pio_test__run_test(const int test_num,
                 data_ok = checker_board_hyperslab_dr_pio_test__verify_data
                           (
                             ptr_1,
-                            mpi_rank,
                             small_rank - 1,
                             edge_size,
                             checker_edge_size,
@@ -3566,7 +3564,6 @@ checker_board_hyperslab_dr_pio_test__run_test(const int test_num,
                 data_ok &= checker_board_hyperslab_dr_pio_test__verify_data
                            (
                              ptr_1 + start_index,
-                             mpi_rank,
                              small_rank - 1,
                              edge_size,
                              checker_edge_size,
@@ -3859,7 +3856,6 @@ checker_board_hyperslab_dr_pio_test__run_test(const int test_num,
                 data_ok &= checker_board_hyperslab_dr_pio_test__verify_data
                            (
                              ptr_1 + start_index,
-                             mpi_rank,
                              small_rank - 1,
                              edge_size,
                              checker_edge_size,
@@ -3965,7 +3961,7 @@ checker_board_hyperslab_dr_pio_test__run_test(const int test_num,
 
     return;
 
-} /* contig_hyperslab_dr_pio_test__run_test() */
+} /* checker_board_hyperslab_dr_pio_test__run_test() */
 
 
 /*-------------------------------------------------------------------------
@@ -3986,7 +3982,6 @@ checker_board_hyperslab_dr_pio_test__run_test(const int test_num,
 void
 checker_board_hyperslab_dr_pio_test(void)
 {
-    const char *fcnName = "checker_board_hyperslab_dr_pio_test()";
     int	        test_num = 0;
     int		edge_size = 10;
     int         checker_edge_size = 3;