[svn-r19897] Extend packed bits and testing to 64 bit integers.

Tested: local Linux

1 files changed, 171 insertions, 9 deletions

diff --git a/tools/h5dump/CMakeLists.txt b/tools/h5dump/CMakeLists.txt
index e830c75..91bc2d1 100644
--- a/tools/h5dump/CMakeLists.txt
+++ b/tools/h5dump/CMakeLists.txt
@@ -12,7 +12,6 @@ INCLUDE_DIRECTORIES (${HDF5_PROJECT_DIR}/test)
 # --------------------------------------------------------------------
 ADD_EXECUTABLE (h5dump ${HDF5_TOOLS_H5DUMP_SOURCE_DIR}/h5dump.c)
 H5_NAMING (h5dump)
-TARGET_WIN_PROPERTIES (h5dump)
 TARGET_LINK_LIBRARIES (h5dump  ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
 
 SET (H5_DEP_EXECUTABLES h5dump)
@@ -30,7 +29,6 @@ IF (BUILD_TESTING)
   IF (HDF5_BUILD_GENERATORS AND NOT BUILD_SHARED_LIBS)
     ADD_EXECUTABLE (h5dumpgentest ${HDF5_TOOLS_H5DUMP_SOURCE_DIR}/h5dumpgentest.c)
     H5_NAMING (h5dumpgentest)
-    TARGET_WIN_PROPERTIES (h5dumpgentest)
     TARGET_LINK_LIBRARIES (h5dumpgentest ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
     
     #ADD_TEST (NAME h5dumpgentest COMMAND $<TARGET_FILE:h5dumpgentest>)
@@ -395,14 +393,54 @@ IF (BUILD_TESTING)
         tpbitsCompound.ddl
         tpbitsIncomplete.ddl
         tpbitsLengthExceeded.ddl
+        tpbitsCharLengthExceeded.ddl
+        tpbitsIntLengthExceeded.ddl
+        tpbitsLongLengthExceeded.ddl
         tpbitsLengthPositive.ddl
         tpbitsMax.ddl
         tpbitsMaxExceeded.ddl
         tpbitsOffsetExceeded.ddl
+        tpbitsCharOffsetExceeded.ddl
+        tpbitsIntOffsetExceeded.ddl
+        tpbitsLongOffsetExceeded.ddl
         tpbitsOffsetNegative.ddl
         tpbitsOverlapped.ddl
         tpbitsSigned.ddl
         tpbitsUnsigned.ddl
+        tpbitsSignedInt.ddl
+        tpbitsUnsignedInt.ddl
+        tpbitsSignedLong.ddl
+        tpbitsUnsignedLong.ddl
+        tpbitsSignedLongLong.ddl
+        tpbitsUnsignedLongLong.ddl
+        tpbitsSignedWhole.ddl
+        tpbitsUnsignedWhole.ddl
+        tpbitsSignedIntWhole.ddl
+        tpbitsUnsignedIntWhole.ddl
+        tpbitsSignedLongWhole.ddl
+        tpbitsUnsignedLongWhole.ddl
+        tpbitsSignedLongLongWhole.ddl
+        tpbitsUnsignedLongLongWhole.ddl
+        tpbitsSignedLongLongWhole1.ddl
+        tpbitsUnsignedLongLongWhole1.ddl
+        tpbitsSignedLongLongWhole63.ddl
+        tpbitsUnsignedLongLongWhole63.ddl
+        tpbitsSigned4.ddl
+        tpbitsUnsigned4.ddl
+        tpbitsSignedInt8.ddl
+        tpbitsUnsignedInt8.ddl
+        tpbitsSignedLong16.ddl
+        tpbitsUnsignedLong16.ddl
+        tpbitsSignedLongLong32.ddl
+        tpbitsUnsignedLongLong32.ddl
+        tpbitsSigned2.ddl
+        tpbitsUnsigned2.ddl
+        tpbitsSignedInt4.ddl
+        tpbitsUnsignedInt4.ddl
+        tpbitsSignedLong8.ddl
+        tpbitsUnsignedLong8.ddl
+        tpbitsSignedLongLong16.ddl
+        tpbitsUnsignedLongLong16.ddl
     )
     SET (HDF5_REFERENCE_TEST_PBITS
         packedbits.h5
@@ -1076,6 +1114,12 @@ IF (BUILD_TESTING)
             tpbitsIncomplete.out.err
             tpbitsLengthExceeded.out
             tpbitsLengthExceeded.out.err
+            tpbitsCharLengthExceeded.out
+            tpbitsCharLengthExceeded.out.err
+            tpbitsIntLengthExceeded.out
+            tpbitsIntLengthExceeded.out.err
+            tpbitsLongLengthExceeded.out
+            tpbitsLongLengthExceeded.out.err
             tpbitsLengthPositive.out
             tpbitsLengthPositive.out.err
             tpbitsMax.out
@@ -1084,6 +1128,12 @@ IF (BUILD_TESTING)
             tpbitsMaxExceeded.out.err
             tpbitsOffsetExceeded.out
             tpbitsOffsetExceeded.out.err
+            tpbitsCharOffsetExceeded.out
+            tpbitsCharOffsetExceeded.out.err
+            tpbitsIntOffsetExceeded.out
+            tpbitsIntOffsetExceeded.out.err
+            tpbitsLongOffsetExceeded.out
+            tpbitsLongOffsetExceeded.out.err
             tpbitsOffsetNegative.out
             tpbitsOffsetNegative.out.err
             tpbitsOverlapped.out
@@ -1092,6 +1142,74 @@ IF (BUILD_TESTING)
             tpbitsSigned.out.err
             tpbitsUnsigned.out
             tpbitsUnsigned.out.err
+            tpbitsSignedInt.out
+            tpbitsSignedInt.out.err
+            tpbitsUnsignedInt.out
+            tpbitsUnsignedInt.out.err
+            tpbitsSignedLong.out
+            tpbitsSignedLong.out.err
+            tpbitsUnsignedLong.out
+            tpbitsUnsignedLong.out.err
+            tpbitsSignedLongLong.out
+            tpbitsSignedLongLong.out.err
+            tpbitsUnsignedLongLong.out
+            tpbitsUnsignedLongLong.out.err
+            tpbitsSignedWhole.out
+            tpbitsSignedWhole.out.err
+            tpbitsUnsignedWhole.out
+            tpbitsUnsignedWhole.out.err
+            tpbitsSignedIntWhole.out
+            tpbitsSignedIntWhole.out.err
+            tpbitsUnsignedIntWhole.out
+            tpbitsUnsignedIntWhole.out.err
+            tpbitsSignedLongWhole.out
+            tpbitsSignedLongWhole.out.err
+            tpbitsUnsignedLongWhole.out
+            tpbitsUnsignedLongWhole.out.err
+            tpbitsSignedLongLongWhole.out
+            tpbitsSignedLongLongWhole.out.err
+            tpbitsUnsignedLongLongWhole.out
+            tpbitsUnsignedLongLongWhole.out.err
+            tpbitsSignedLongLongWhole1.out
+            tpbitsSignedLongLongWhole1.out.err
+            tpbitsUnsignedLongLongWhole1.out
+            tpbitsUnsignedLongLongWhole1.out.err
+            tpbitsSignedLongLongWhole63.out
+            tpbitsSignedLongLongWhole63.out.err
+            tpbitsUnsignedLongLongWhole63.out
+            tpbitsUnsignedLongLongWhole63.out.err
+            tpbitsSigned4.out
+            tpbitsSigned4.out.err
+            tpbitsUnsigned4.out
+            tpbitsUnsigned4.out.err
+            tpbitsSignedInt8.out
+            tpbitsSignedInt8.out.err
+            tpbitsUnsignedInt8.out
+            tpbitsUnsignedInt8.out.err
+            tpbitsSignedLong16.out
+            tpbitsSignedLong16.out.err
+            tpbitsUnsignedLong16.out
+            tpbitsUnsignedLong16.out.err
+            tpbitsSignedLongLong32.out
+            tpbitsSignedLongLong32.out.err
+            tpbitsUnsignedLongLong32.out
+            tpbitsUnsignedLongLong32.out.err
+            tpbitsSigned2.out
+            tpbitsSigned2.out.err
+            tpbitsUnsigned2.out
+            tpbitsUnsigned2.out.err
+            tpbitsSignedInt4.out
+            tpbitsSignedInt4.out.err
+            tpbitsUnsignedInt4.out
+            tpbitsUnsignedInt4.out.err
+            tpbitsSignedLong8.out
+            tpbitsSignedLong8.out.err
+            tpbitsUnsignedLong8.out
+            tpbitsUnsignedLong8.out.err
+            tpbitsSignedLongLong16.out
+            tpbitsSignedLongLong16.out.err
+            tpbitsUnsignedLongLong16.out
+            tpbitsUnsignedLongLong16.out.err
     )
 
     # test failure handling
@@ -1099,14 +1217,52 @@ IF (BUILD_TESTING)
     ADD_H5_TEST (tnofilename-with-packed-bits 1)
     # Limits:
     # Maximum number of packed bits is 8 (for now).
-    # Maximum integer size is 8 (for now).
-    # Maximun Offset is 7 (Maximum size - 1).
-    # Maximum Offset+Length is 8 (Maximum size).
+    # Maximum integer size is 8*sizeof(long long).
+    # Maximun Offset is Maximum size - 1.
+    # Maximum Offset+Length is Maximum size.
     # Tests:
     # Normal operation on both signed and unsigned int datasets.
+    # Sanity check
     # Their rawdata output should be the same.
+    ADD_H5_TEST (tpbitsSignedWhole 0 -d /DS08BITS -M 0,8 packedbits.h5)
+    ADD_H5_TEST (tpbitsUnsignedWhole 0 -d /DU08BITS -M 0,8 packedbits.h5)
+    ADD_H5_TEST (tpbitsSignedIntWhole 0 -d /DS16BITS -M 0,16 packedbits.h5)
+    ADD_H5_TEST (tpbitsUnsignedIntWhole 0 -d /DU16BITS -M 0,16 packedbits.h5)
+    ADD_H5_TEST (tpbitsSignedLongWhole 0 -d /DS32BITS -M 0,32 packedbits.h5)
+    ADD_H5_TEST (tpbitsUnsignedLongWhole 0 -d /DU32BITS -M 0,32 packedbits.h5)
+    ADD_H5_TEST (tpbitsSignedLongLongWhole 0 -d /DS64BITS -M 0,64 packedbits.h5)
+    ADD_H5_TEST (tpbitsUnsignedLongLongWhole 0 -d /DU64BITS -M 0,64 packedbits.h5)
+    ADD_H5_TEST (tpbitsSignedLongLongWhole63 0 -d /DS64BITS -M 0,63 packedbits.h5)
+    ADD_H5_TEST (tpbitsUnsignedLongLongWhole63 0 -d /DU64BITS -M 0,63 packedbits.h5)
+    ADD_H5_TEST (tpbitsSignedLongLongWhole1 0 -d /DS64BITS -M 1,63 packedbits.h5)
+    ADD_H5_TEST (tpbitsUnsignedLongLongWhole1 0 -d /DU64BITS -M 1,63 packedbits.h5)
+    # Half sections
+    ADD_H5_TEST (tpbitsSigned4 0 -d /DS08BITS -M 0,4,4,4 packedbits.h5)
+    ADD_H5_TEST (tpbitsUnsigned4 0 -d /DU08BITS -M 0,4,4,4 packedbits.h5)
+    ADD_H5_TEST (tpbitsSignedInt8 0 -d /DS16BITS -M 0,8,8,8 packedbits.h5)
+    ADD_H5_TEST (tpbitsUnsignedInt8 0 -d /DU16BITS -M 0,8,8,8 packedbits.h5)
+    ADD_H5_TEST (tpbitsSignedLong16 0 -d /DS32BITS -M 0,16,16,16 packedbits.h5)
+    ADD_H5_TEST (tpbitsUnsignedLong16 0 -d /DU32BITS -M 0,16,16,16 packedbits.h5)
+    ADD_H5_TEST (tpbitsSignedLongLong32 0 -d /DS64BITS -M 0,32,32,32 packedbits.h5)
+    ADD_H5_TEST (tpbitsUnsignedLongLong32 0 -d /DU64BITS -M 0,32,32,32 packedbits.h5)
+    # Quarter sections
+    ADD_H5_TEST (tpbitsSigned2 0 -d /DS08BITS -M 0,2,2,2,4,2,6,2 packedbits.h5)
+    ADD_H5_TEST (tpbitsUnsigned2 0 -d /DU08BITS -M 0,2,2,2,4,2,6,2 packedbits.h5)
+    ADD_H5_TEST (tpbitsSignedInt4 0 -d /DS16BITS -M 0,4,4,4,8,4,12,4 packedbits.h5)
+    ADD_H5_TEST (tpbitsUnsignedInt4 0 -d /DU16BITS -M 0,4,4,4,8,4,12,4 packedbits.h5)
+    ADD_H5_TEST (tpbitsSignedLong8 0 -d /DS32BITS -M 0,8,8,8,16,8,24,8 packedbits.h5)
+    ADD_H5_TEST (tpbitsUnsignedLong8 0 -d /DU32BITS -M 0,8,8,8,16,8,24,8 packedbits.h5)
+    ADD_H5_TEST (tpbitsSignedLongLong16 0 -d /DS64BITS -M 0,16,16,16,32,16,48,16 packedbits.h5)
+    ADD_H5_TEST (tpbitsUnsignedLongLong16 0 -d /DU64BITS -M 0,16,16,16,32,16,48,16 packedbits.h5)
+    # Begin and End
     ADD_H5_TEST (tpbitsSigned 0 -d /DS08BITS -M 0,2,2,6 packedbits.h5)
     ADD_H5_TEST (tpbitsUnsigned 0 -d /DU08BITS -M 0,2,2,6 packedbits.h5)
+    ADD_H5_TEST (tpbitsSignedInt 0 -d /DS16BITS -M 0,2,10,6 packedbits.h5)
+    ADD_H5_TEST (tpbitsUnsignedInt 0 -d /DU16BITS -M 0,2,10,6 packedbits.h5)
+    ADD_H5_TEST (tpbitsSignedLong 0 -d /DS32BITS -M 0,2,26,6 packedbits.h5)
+    ADD_H5_TEST (tpbitsUnsignedLong 0 -d /DU32BITS -M 0,2,26,6 packedbits.h5)
+    ADD_H5_TEST (tpbitsSignedLongLong 0 -d /DS64BITS -M 0,2,58,6 packedbits.h5)
+    ADD_H5_TEST (tpbitsUnsignedLongLong 0 -d /DU64BITS -M 0,2,58,6 packedbits.h5)
     # Overlapped packed bits.
     ADD_H5_TEST (tpbitsOverlapped 0 -d /DS08BITS -M 0,1,1,1,2,1,0,3 packedbits.h5)
     # Maximum number of packed bits.
@@ -1118,14 +1274,20 @@ IF (BUILD_TESTING)
     # Test Error handling.
     # Too many packed bits requested. Max is 8 for now.
     ADD_H5_TEST (tpbitsMaxExceeded 1 -d /DS08BITS -M 0,1,0,1,1,1,2,1,3,1,4,1,5,1,6,1,7,1 packedbits.h5)
-    # Offset too large. Max is 7 (8-1) for now.
-    ADD_H5_TEST (tpbitsOffsetExceeded 1 -d /DS08BITS -M 8,1 packedbits.h5)
+    # Offset too large. Max is 8*sizeof(long long.
+    ADD_H5_TEST (tpbitsOffsetExceeded 1 -d /DS08BITS -M 64,1 packedbits.h5)
+    ADD_H5_TEST (tpbitsCharOffsetExceeded 0 -d /DS08BITS -M 8,1 packedbits.h5)
+    ADD_H5_TEST (tpbitsIntOffsetExceeded 0 -d /DS16BITS -M 16,1 packedbits.h5)
+    ADD_H5_TEST (tpbitsLongOffsetExceeded 0 -d /DS32BITS -M 32,1 packedbits.h5)
     # Bad offset, must not be negative.
     ADD_H5_TEST (tpbitsOffsetNegative 1 -d /DS08BITS -M -1,1 packedbits.h5)
     # Bad length, must not be positive.
     ADD_H5_TEST (tpbitsLengthPositive 1 -d /DS08BITS -M 4,0 packedbits.h5)
-    # Offset+Length is too large. Max is 8 for now.
-    ADD_H5_TEST (tpbitsLengthExceeded 1 -d /DS08BITS -M 2,7 packedbits.h5)
+    # Offset+Length is too large. Max is 8*sizeof(long long).
+    ADD_H5_TEST (tpbitsLengthExceeded 1 -d /DS08BITS -M 37,28 packedbits.h5)
+    ADD_H5_TEST (tpbitsCharLengthExceeded 0 -d /DS08BITS -M 2,7 packedbits.h5)
+    ADD_H5_TEST (tpbitsIntLengthExceeded 0 -d /DS16BITS -M 10,7 packedbits.h5)
+    ADD_H5_TEST (tpbitsLongLengthExceeded 0 -d /DS32BITS -M 26,7 packedbits.h5)
     # Incomplete pair of packed bits request.
     ADD_H5_TEST (tpbitsIncomplete 1 -d /DS08BITS -M 0,2,2,1,0,2,2, packedbits.h5)
   ENDIF (HDF5_USE_H5DUMP_PACKED_BITS)