[svn-r23347] ported revision 23248:23346 from the trunk

5 files changed, 17 insertions, 71 deletions

diff --git a/config/cmake/CTestCustom.cmake b/config/cmake/CTestCustom.cmake
index c33201f..ec7b10e 100755
--- a/config/cmake/CTestCustom.cmake
+++ b/config/cmake/CTestCustom.cmake
@@ -38,35 +38,15 @@ SET (CTEST_CUSTOM_MEMCHECK_IGNORE
     hl_test-clear-objects
     hl_fortran_test-clear-objects
     ######### tools/h5copy #########
-    H5COPY-clear-refs
-    H5COPY-clear-ext-links
-    H5COPY-clear-misc
+    H5COPY-clearall-objects
     ######### tools/h5diff #########
     H5DIFF-clearall-objects
     ######### tools/h5dump #########
     H5DUMP-clearall-objects
-    H5DUMP-clear-out1
-    H5DUMP-clear-out3
-    H5DUMP-clear-objects
     H5DUMP_PACKED_BITS-clearall-objects
     H5DUMP-XML-clearall-objects
     ######### tools/h5import #########
-    H5IMPORT-ASCII_I32-clear-objects
-    H5IMPORT-ASCII_I16-clear-objects
-    H5IMPORT-ASCII_I8-clear-objects
-    H5IMPORT-ASCII_UI16-clear-objects
-    H5IMPORT-ASCII_UI32-clear-objects
-    H5IMPORT-ASCII_F32-clear-objects
-    H5IMPORT-ASCII_F64-clear-objects
-    H5IMPORT-BINARY_F64-clear-objects
-    H5IMPORT-BINARY_I8-clear-objects
-    H5IMPORT-BINARY_I16-clear-objects
-    H5IMPORT-BINARY_I32-clear-objects
-    H5IMPORT-BINARY_UI16-clear-objects
-    H5IMPORT-BINARY_UI32-clear-objects
-    H5IMPORT-STR-clear-objects
-    H5IMPORT-BINARY_I8_EOF-clear-objects
-    H5IMPORT-ASCII_F64_R1-clear-objects
+    H5IMPORT-clear-objects
     ######### tools/h5jam #########
     H5JAM-SETUP-N_twithub_u10_c-clear-objects
     H5JAM-SETUP-N_twithub_u10_c
@@ -225,47 +205,8 @@ SET (CTEST_CUSTOM_MEMCHECK_IGNORE
     ######### tools/h5stat #########
     H5STAT-clearall-objects
     ######### tools/misc #########
-    h5repart_20K-clear-objects
-    h5repart_5K-clear-objects
-    h5repart_sec2-clear-objects
-    H5MKGRP_CMP-clear-h5mkgrp_help
-    H5MKGRP_CMP-clear-h5mkgrp_version
-    H5MKGRP-clear-h5mkgrp_single
-    H5MKGRP-h5mkgrp_single                              #uses runTest.cmake
-    H5MKGRP-h5ls-h5mkgrp_single                         #uses runTest.cmake
-    H5MKGRP-clear-h5mkgrp_single-v
-    H5MKGRP-h5mkgrp_single-v                            #uses runTest.cmake
-    H5MKGRP-h5ls-h5mkgrp_single-v                       #uses runTest.cmake
-    H5MKGRP-clear-h5mkgrp_single-p
-    H5MKGRP-h5mkgrp_single-p                            #uses runTest.cmake
-    H5MKGRP-h5ls-h5mkgrp_single-p                       #uses runTest.cmake
-    H5MKGRP-clear-h5mkgrp_single_latest-l
-    H5MKGRP-h5mkgrp_single_latest-l                     #uses runTest.cmake
-    H5MKGRP-h5ls-h5mkgrp_single_latest-l                #uses runTest.cmake
-    H5MKGRP-clear-h5mkgrp_several
-    H5MKGRP-h5mkgrp_several                             #uses runTest.cmake
-    H5MKGRP-h5ls-h5mkgrp_several                        #uses runTest.cmake
-    H5MKGRP-clear-h5mkgrp_several-v
-    H5MKGRP-h5mkgrp_several-v                           #uses runTest.cmake
-    H5MKGRP-h5ls-h5mkgrp_several-v                      #uses runTest.cmake
-    H5MKGRP-clear-h5mkgrp_several-p
-    H5MKGRP-h5mkgrp_several-p                           #uses runTest.cmake
-    H5MKGRP-h5ls-h5mkgrp_several-p                      #uses runTest.cmake
-    H5MKGRP-clear-h5mkgrp_several_latest-l
-    H5MKGRP-h5mkgrp_several_latest-l                    #uses runTest.cmake
-    H5MKGRP-h5ls-h5mkgrp_several_latest-l               #uses runTest.cmake
-    H5MKGRP-clear-h5mkgrp_nested-p
-    H5MKGRP-h5mkgrp_nested-p                            #uses runTest.cmake
-    H5MKGRP-h5ls-h5mkgrp_nested-p                       #uses runTest.cmake
-    H5MKGRP-clear-h5mkgrp_nested_latest-lp
-    H5MKGRP-h5mkgrp_nested_latest-lp                    #uses runTest.cmake
-    H5MKGRP-h5ls-h5mkgrp_nested_latest-lp               #uses runTest.cmake
-    H5MKGRP-clear-h5mkgrp_nested_mult-p
-    H5MKGRP-h5mkgrp_nested_mult-p                       #uses runTest.cmake
-    H5MKGRP-h5ls-h5mkgrp_nested_mult-p                  #uses runTest.cmake
-    H5MKGRP-clear-h5mkgrp_nested_mult_latest-lp
-    H5MKGRP-h5mkgrp_nested_mult_latest-lp               #uses runTest.cmake
-    H5MKGRP-h5ls-h5mkgrp_nested_mult_latest-lp          #uses runTest.cmake
+    H5REPART-clearall-objects
+    H5MKGRP-clearall-objects
     ######### examples #########
     EXAMPLES-clear-objects
     cpp_ex-clear-objects
diff --git a/config/cmake/grepTest.cmake b/config/cmake/grepTest.cmake
index 365d9c3..74ac912 100644
--- a/config/cmake/grepTest.cmake
+++ b/config/cmake/grepTest.cmake
@@ -57,7 +57,7 @@ IF (${TEST_EXPECT} STREQUAL "1")
   IF (NOT ${TEST_RESULT} STREQUAL "0")
     MESSAGE (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did contain ${TEST_FILTER}")
   ENDIF (NOT ${TEST_RESULT} STREQUAL "0")
-ENDIF (${TEST_EXPECT} STREQUAL "0")
+ENDIF (${TEST_EXPECT} STREQUAL "1")
 
 # everything went fine...
 MESSAGE ("Passed: The output of ${TEST_PROGRAM} matched")
diff --git a/config/cmake/mccacheinit.cmake b/config/cmake/mccacheinit.cmake
index b472acf..8ca3879 100755
--- a/config/cmake/mccacheinit.cmake
+++ b/config/cmake/mccacheinit.cmake
@@ -8,6 +8,8 @@ SET (BUILD_SHARED_LIBS OFF CACHE BOOL "Build Shared Libraries" FORCE)
 

 SET (BUILD_TESTING ON CACHE BOOL "Build HDF5 Unit Testing" FORCE)

 

+SET (HDF_PACKAGE_EXT "" CACHE STRING "Name of HDF package extension" FORCE)

+

 SET (HDF5_BUILD_CPP_LIB ON CACHE BOOL "Build HDF5 C++ Library" FORCE)

 

 SET (HDF5_BUILD_EXAMPLES ON CACHE BOOL "Build HDF5 Library Examples" FORCE)

@@ -58,7 +60,7 @@ SET (HDF5_ENABLE_THREADSAFE OFF CACHE BOOL "(WINDOWS)Enable Threadsafety" FORCE)
 

 SET (HDF5_PACKAGE_EXTLIBS OFF CACHE BOOL "(WINDOWS)CPACK - include external libraries" FORCE)

 

-SET (HDF5_NO_PACKAGES OFF CACHE BOOL "CPACK - Disable packaging" FORCE)

+SET (HDF5_NO_PACKAGES ON CACHE BOOL "CPACK - Disable packaging" FORCE)

 

 SET (HDF5_ALLOW_EXTERNAL_SUPPORT "NO" CACHE STRING "Allow External Library Building" FORCE)

 

@@ -74,3 +76,6 @@ SET (CMAKE_BUILD_TYPE "Debug" CACHE STRING "Build Debug" FORCE)
 

 SET (CTEST_BUILD_CONFIGURATION "Debug" CACHE STRING "Build Debug" FORCE)

 

+SET (ZLIB_PACKAGE_NAME "zlib" CACHE STRING "Name of ZLIB package" FORCE)

+

+SET (SZIP_PACKAGE_NAME "szip" CACHE STRING "Name of SZIP package" FORCE)

diff --git a/config/cmake/userblockTest.cmake b/config/cmake/userblockTest.cmake
index 5e8a808..8910bb2 100644
--- a/config/cmake/userblockTest.cmake
+++ b/config/cmake/userblockTest.cmake
@@ -65,17 +65,17 @@ IF (TEST_CHECKUB STREQUAL "YES")
         COMMAND ${TEST_GET_PROGRAM} -c ${TEST_O_STRING_LEN} ${TEST_OFILE}
         WORKING_DIRECTORY ${TEST_FOLDER}
         RESULT_VARIABLE TEST_RESULT
-        OUTPUT_FILE ${TEST_UFILE}.cmp
+        OUTPUT_FILE ${TEST_HFILE}-ub.cmp
         OUTPUT_VARIABLE TEST_ERROR
         ERROR_VARIABLE TEST_ERROR
         OUTPUT_STRIP_TRAILING_WHITESPACE
     )
     #cat $ufile >> $cmpfile
     FILE (STRINGS ${TEST_UFILE} TEST_STREAM NEWLINE_CONSUME)
-    FILE (APPEND ${TEST_UFILE}.cmp "${TEST_STREAM}") 
+    FILE (APPEND ${TEST_HFILE}-ub.cmp "${TEST_STREAM}") 
   ELSE (NOT TEST_O_STRING_LEN STREQUAL "0")
     FILE (STRINGS ${TEST_UFILE} TEST_STREAM NEWLINE_CONSUME)
-    FILE (WRITE ${TEST_UFILE}.cmp ${TEST_STREAM})
+    FILE (WRITE ${TEST_HFILE}-ub.cmp ${TEST_STREAM})
   ENDIF (NOT TEST_O_STRING_LEN STREQUAL "0")
 
   #$JAM_BIN/getub -c $size $hfile > $tfile
@@ -91,14 +91,14 @@ IF (TEST_CHECKUB STREQUAL "YES")
 
   # now compare the outputs
   EXECUTE_PROCESS (
-      COMMAND ${CMAKE_COMMAND} -E compare_files ${TEST_UFILE}.cmp ${TEST_HFILE}.cmp
+      COMMAND ${CMAKE_COMMAND} -E compare_files ${TEST_HFILE}-ub.cmp ${TEST_HFILE}.cmp
       RESULT_VARIABLE TEST_RESULT
   )
 
   MESSAGE (STATUS "COMPARE Result: ${TEST_RESULT}: ${TEST_STRING_SIZE}=${TEST_U_STRING_LEN}+${TEST_O_STRING_LEN}")
   # if the return value is !=${TEST_EXPECT} bail out
   IF (NOT ${TEST_RESULT} STREQUAL ${TEST_EXPECT})
-    MESSAGE (FATAL_ERROR "Failed: The output of ${TEST_UFILE} did not match ${TEST_HFILE}.\n${TEST_ERROR}")
+    MESSAGE (FATAL_ERROR "Failed: The output of ${TEST_HFILE}-ub did not match ${TEST_HFILE}.\n${TEST_ERROR}")
   ENDIF (NOT ${TEST_RESULT} STREQUAL ${TEST_EXPECT})
 ELSE (TEST_CHECKUB STREQUAL "YES")
     # call 'ubsize' to get the size of the user block
diff --git a/config/lt_vers.am b/config/lt_vers.am
index d94d73c..37b5b68 100644
--- a/config/lt_vers.am
+++ b/config/lt_vers.am
@@ -17,7 +17,7 @@
 # Add libtool shared library version numbers to the HDF5 library
 # See libtool versioning documentation online.
 LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 134
+LT_VERS_REVISION = 138
 LT_VERS_AGE = 0
 
 ## If the API changes *at all*, increment LT_VERS_INTERFACE and