[svn-r20184] Enable h5dump tests in valgrind

2 files changed, 223 insertions, 195 deletions

diff --git a/config/cmake/CTestCustom.cmake b/config/cmake/CTestCustom.cmake
index 68b0642..085c36c 100755
--- a/config/cmake/CTestCustom.cmake
+++ b/config/cmake/CTestCustom.cmake
@@ -179,130 +179,130 @@ SET (CTEST_CUSTOM_MEMCHECK_IGNORE
     H5DIFF-h5diff_530     #uses runTest.cmake
     ######### tools/h5dump #########
     H5DUMP-clearall-objects
-    H5DUMP-packedbits      #uses runTest.cmake
-    H5DUMP-tgroup-1        #uses runTest.cmake
-    H5DUMP-tgroup-2        #uses runTest.cmake
-    H5DUMP-tdset-1         #uses runTest.cmake
-    H5DUMP-tdset-2         #uses runTest.cmake
-    H5DUMP-tattr-1         #uses runTest.cmake
-    H5DUMP-tattr-2         #uses runTest.cmake
-    H5DUMP-tattr-3         #uses runTest.cmake
-    H5DUMP-tnamed_dtype_attr     #uses runTest.cmake
-    H5DUMP-tslink-1        #uses runTest.cmake
-    H5DUMP-tudlink-1       #uses runTest.cmake
-    H5DUMP-tslink-2        #uses runTest.cmake
-    H5DUMP-tudlink-2       #uses runTest.cmake
-    H5DUMP-thlink-1        #uses runTest.cmake
-    H5DUMP-thlink-2        #uses runTest.cmake
-    H5DUMP-thlink-3        #uses runTest.cmake
-    H5DUMP-thlink-4        #uses runTest.cmake
-    H5DUMP-thlink-5        #uses runTest.cmake
-    H5DUMP-tcomp-1         #uses runTest.cmake
-    H5DUMP-tcomp-2         #uses runTest.cmake
-    H5DUMP-tcomp-4         #uses runTest.cmake
-    H5DUMP-tnestcomp-1     #uses runTest.cmake
-    H5DUMP-tall-1          #uses runTest.cmake
-    H5DUMP-tall-2          #uses runTest.cmake
-    H5DUMP-tall-3          #uses runTest.cmake
-    H5DUMP-tloop-1         #uses runTest.cmake
-    H5DUMP-tstr-1          #uses runTest.cmake
-    H5DUMP-tstr-2          #uses runTest.cmake
-    H5DUMP-tsaf            #uses runTest.cmake
-    H5DUMP-tvldtypes1      #uses runTest.cmake
-    H5DUMP-tvldtypes2      #uses runTest.cmake
-    H5DUMP-tvldtypes3      #uses runTest.cmake
-    H5DUMP-tvldtypes4      #uses runTest.cmake
-    H5DUMP-tvldtypes5      #uses runTest.cmake
-    H5DUMP-tvlstr          #uses runTest.cmake
-    H5DUMP-tarray1         #uses runTest.cmake
-    H5DUMP-tarray1_big     #uses runTest.cmake
-    H5DUMP-tarray2         #uses runTest.cmake
-    H5DUMP-tarray3         #uses runTest.cmake
-    H5DUMP-tarray4         #uses runTest.cmake
-    H5DUMP-tarray5         #uses runTest.cmake
-    H5DUMP-tarray6         #uses runTest.cmake
-    H5DUMP-tarray7         #uses runTest.cmake
-    H5DUMP-tarray8         #uses runTest.cmake
-    H5DUMP-tempty          #uses runTest.cmake
-    H5DUMP-tgrp_comments   #uses runTest.cmake
-    H5DUMP-tsplit_file     #uses runTest.cmake
-    H5DUMP-tfamily         #uses runTest.cmake
-    H5DUMP-tmulti          #uses runTest.cmake
-    H5DUMP-tlarge_objname  #uses runTest.cmake
-    H5DUMP-tall-2A         #uses runTest.cmake
-    H5DUMP-tall-2B         #uses runTest.cmake
-    H5DUMP-tall-4s         #uses runTest.cmake
-    H5DUMP-tall-5s         #uses runTest.cmake
-    H5DUMP-tdset-3s        #uses runTest.cmake
-    H5DUMP-tchar1          #uses runTest.cmake
-    H5DUMP-tchar1          #uses runTest.cmake
-    H5DUMP-tnofilename     #uses runTest.cmake
-    H5DUMP-tboot1          #uses runTest.cmake
-    H5DUMP-tboot2          #uses runTest.cmake
-    H5DUMP-tperror         #uses runTest.cmake
-    H5DUMP-tcontents       #uses runTest.cmake
-    H5DUMP-tcompact        #uses runTest.cmake
-    H5DUMP-tcontiguos      #uses runTest.cmake
-    H5DUMP-tchunked        #uses runTest.cmake
-    H5DUMP-texternal       #uses runTest.cmake
-    H5DUMP-tfill           #uses runTest.cmake
-    H5DUMP-treference      #uses runTest.cmake
-    H5DUMP-tstringe        #uses runTest.cmake
-    H5DUMP-tstring         #uses runTest.cmake
-    H5DUMP-tstring2        #uses runTest.cmake
-    H5DUMP-tindicesyes     #uses runTest.cmake
-    H5DUMP-tindicesno      #uses runTest.cmake
-    H5DUMP-tindicessub1    #uses runTest.cmake
-    H5DUMP-tindicessub2    #uses runTest.cmake
-    H5DUMP-tindicessub3    #uses runTest.cmake
-    H5DUMP-tindicessub4    #uses runTest.cmake
-    H5DUMP-tszip           #uses runTest.cmake
-    H5DUMP-tdeflate        #uses runTest.cmake
-    H5DUMP-tshuffle        #uses runTest.cmake
-    H5DUMP-tfletcher32     #uses runTest.cmake
-    H5DUMP-tnbit           #uses runTest.cmake
-    H5DUMP-tscaleoffset    #uses runTest.cmake
-    H5DUMP-tallfilters     #uses runTest.cmake
-    H5DUMP-tuserfilter     #uses runTest.cmake
-    H5DUMP-tlonglinks      #uses runTest.cmake
-    H5DUMP-tbigdims        #uses runTest.cmake
-    H5DUMP-thyperslab      #uses runTest.cmake
-    H5DUMP-tnullspace      #uses runTest.cmake
-    H5DUMP-tvms            #uses runTest.cmake
-    H5DUMP-tbin1LE         #uses runTest.cmake
-    H5DUMP-tbin1           #uses runTest.cmake
-    H5DUMP-clear-out1
-    H5DUMP-h5import-out1
-    H5DUMP-h5diff-out1
-    H5DUMP-tbin2                     #uses runTest.cmake
-    H5DUMP-tbin3                     #uses runTest.cmake
-    H5DUMP-clear-out3
-    H5DUMP-h5import-out3
-    H5DUMP-h5diff-out3
-    H5DUMP-clear-objects
-    H5DUMP-tbin4                     #uses runTest.cmake
-    H5DUMP-tdatareg                  #uses runTest.cmake
-    H5DUMP-tdataregR                 #uses runTest.cmake
-    H5DUMP-tattrreg                  #uses runTest.cmake
-    H5DUMP-tattrregR                 #uses runTest.cmake
-    H5DUMP-output-tbinregR           #uses runTest.cmake
-    H5DUMP-output-cmp-tbinregR       #uses runTest.cmake
-    H5DUMP-tordergr1                 #uses runTest.cmake
-    H5DUMP-tordergr2                 #uses runTest.cmake
-    H5DUMP-tordergr3                 #uses runTest.cmake
-    H5DUMP-tordergr4                 #uses runTest.cmake
-    H5DUMP-tordergr5                 #uses runTest.cmake
-    H5DUMP-torderattr1               #uses runTest.cmake
-    H5DUMP-torderattr2               #uses runTest.cmake
-    H5DUMP-torderattr3               #uses runTest.cmake
-    H5DUMP-torderattr4               #uses runTest.cmake
-    H5DUMP-tfpformat                 #uses runTest.cmake
-    H5DUMP-textlinksrc               #uses runTest.cmake
-    H5DUMP-textlinkfar               #uses runTest.cmake
-    H5DUMP-textlink                  #uses runTest.cmake
-    H5DUMP_PACKED_BITS-clearall-objects
-    H5DUMP-tpackedbits               #uses runTest.cmake
-    H5DUMP-tpackedbits2              #uses runTest.cmake
+#    H5DUMP-packedbits      #uses runTest.cmake
+#    H5DUMP-tgroup-1        #uses runTest.cmake
+#    H5DUMP-tgroup-2        #uses runTest.cmake
+#    H5DUMP-tdset-1         #uses runTest.cmake
+#    H5DUMP-tdset-2         #uses runTest.cmake
+#    H5DUMP-tattr-1         #uses runTest.cmake
+#    H5DUMP-tattr-2         #uses runTest.cmake
+#    H5DUMP-tattr-3         #uses runTest.cmake
+#    H5DUMP-tnamed_dtype_attr     #uses runTest.cmake
+#    H5DUMP-tslink-1        #uses runTest.cmake
+#    H5DUMP-tudlink-1       #uses runTest.cmake
+#    H5DUMP-tslink-2        #uses runTest.cmake
+#    H5DUMP-tudlink-2       #uses runTest.cmake
+#    H5DUMP-thlink-1        #uses runTest.cmake
+#    H5DUMP-thlink-2        #uses runTest.cmake
+#    H5DUMP-thlink-3        #uses runTest.cmake
+#    H5DUMP-thlink-4        #uses runTest.cmake
+#    H5DUMP-thlink-5        #uses runTest.cmake
+#    H5DUMP-tcomp-1         #uses runTest.cmake
+#    H5DUMP-tcomp-2         #uses runTest.cmake
+#    H5DUMP-tcomp-4         #uses runTest.cmake
+#    H5DUMP-tnestcomp-1     #uses runTest.cmake
+#    H5DUMP-tall-1          #uses runTest.cmake
+#    H5DUMP-tall-2          #uses runTest.cmake
+#    H5DUMP-tall-3          #uses runTest.cmake
+#    H5DUMP-tloop-1         #uses runTest.cmake
+#    H5DUMP-tstr-1          #uses runTest.cmake
+#    H5DUMP-tstr-2          #uses runTest.cmake
+#    H5DUMP-tsaf            #uses runTest.cmake
+#    H5DUMP-tvldtypes1      #uses runTest.cmake
+#    H5DUMP-tvldtypes2      #uses runTest.cmake
+#    H5DUMP-tvldtypes3      #uses runTest.cmake
+#    H5DUMP-tvldtypes4      #uses runTest.cmake
+#    H5DUMP-tvldtypes5      #uses runTest.cmake
+#    H5DUMP-tvlstr          #uses runTest.cmake
+#    H5DUMP-tarray1         #uses runTest.cmake
+#    H5DUMP-tarray1_big     #uses runTest.cmake
+#    H5DUMP-tarray2         #uses runTest.cmake
+#    H5DUMP-tarray3         #uses runTest.cmake
+#    H5DUMP-tarray4         #uses runTest.cmake
+#    H5DUMP-tarray5         #uses runTest.cmake
+#    H5DUMP-tarray6         #uses runTest.cmake
+#    H5DUMP-tarray7         #uses runTest.cmake
+#    H5DUMP-tarray8         #uses runTest.cmake
+#    H5DUMP-tempty          #uses runTest.cmake
+#    H5DUMP-tgrp_comments   #uses runTest.cmake
+#    H5DUMP-tsplit_file     #uses runTest.cmake
+#    H5DUMP-tfamily         #uses runTest.cmake
+#    H5DUMP-tmulti          #uses runTest.cmake
+#    H5DUMP-tlarge_objname  #uses runTest.cmake
+#    H5DUMP-tall-2A         #uses runTest.cmake
+#    H5DUMP-tall-2B         #uses runTest.cmake
+#    H5DUMP-tall-4s         #uses runTest.cmake
+#    H5DUMP-tall-5s         #uses runTest.cmake
+#    H5DUMP-tdset-3s        #uses runTest.cmake
+#    H5DUMP-tchar1          #uses runTest.cmake
+#    H5DUMP-tchar1          #uses runTest.cmake
+#    H5DUMP-tnofilename     #uses runTest.cmake
+#    H5DUMP-tboot1          #uses runTest.cmake
+#    H5DUMP-tboot2          #uses runTest.cmake
+#    H5DUMP-tperror         #uses runTest.cmake
+#    H5DUMP-tcontents       #uses runTest.cmake
+#    H5DUMP-tcompact        #uses runTest.cmake
+#    H5DUMP-tcontiguos      #uses runTest.cmake
+#    H5DUMP-tchunked        #uses runTest.cmake
+#    H5DUMP-texternal       #uses runTest.cmake
+#    H5DUMP-tfill           #uses runTest.cmake
+#    H5DUMP-treference      #uses runTest.cmake
+#    H5DUMP-tstringe        #uses runTest.cmake
+#    H5DUMP-tstring         #uses runTest.cmake
+#    H5DUMP-tstring2        #uses runTest.cmake
+#    H5DUMP-tindicesyes     #uses runTest.cmake
+#    H5DUMP-tindicesno      #uses runTest.cmake
+#    H5DUMP-tindicessub1    #uses runTest.cmake
+#    H5DUMP-tindicessub2    #uses runTest.cmake
+#    H5DUMP-tindicessub3    #uses runTest.cmake
+#    H5DUMP-tindicessub4    #uses runTest.cmake
+#    H5DUMP-tszip           #uses runTest.cmake
+#    H5DUMP-tdeflate        #uses runTest.cmake
+#    H5DUMP-tshuffle        #uses runTest.cmake
+#    H5DUMP-tfletcher32     #uses runTest.cmake
+#    H5DUMP-tnbit           #uses runTest.cmake
+#    H5DUMP-tscaleoffset    #uses runTest.cmake
+#    H5DUMP-tallfilters     #uses runTest.cmake
+#    H5DUMP-tuserfilter     #uses runTest.cmake
+#    H5DUMP-tlonglinks      #uses runTest.cmake
+#    H5DUMP-tbigdims        #uses runTest.cmake
+#    H5DUMP-thyperslab      #uses runTest.cmake
+#    H5DUMP-tnullspace      #uses runTest.cmake
+#    H5DUMP-tvms            #uses runTest.cmake
+#    H5DUMP-tbin1LE         #uses runTest.cmake
+#    H5DUMP-tbin1           #uses runTest.cmake
+#    H5DUMP-clear-out1
+#    H5DUMP-h5import-out1
+#    H5DUMP-h5diff-out1
+#    H5DUMP-tbin2                     #uses runTest.cmake
+#    H5DUMP-tbin3                     #uses runTest.cmake
+#    H5DUMP-clear-out3
+#    H5DUMP-h5import-out3
+#    H5DUMP-h5diff-out3
+#    H5DUMP-clear-objects
+#    H5DUMP-tbin4                     #uses runTest.cmake
+#    H5DUMP-tdatareg                  #uses runTest.cmake
+#    H5DUMP-tdataregR                 #uses runTest.cmake
+#    H5DUMP-tattrreg                  #uses runTest.cmake
+#    H5DUMP-tattrregR                 #uses runTest.cmake
+#    H5DUMP-output-tbinregR           #uses runTest.cmake
+#    H5DUMP-output-cmp-tbinregR       #uses runTest.cmake
+#    H5DUMP-tordergr1                 #uses runTest.cmake
+#    H5DUMP-tordergr2                 #uses runTest.cmake
+#    H5DUMP-tordergr3                 #uses runTest.cmake
+#    H5DUMP-tordergr4                 #uses runTest.cmake
+#    H5DUMP-tordergr5                 #uses runTest.cmake
+#    H5DUMP-torderattr1               #uses runTest.cmake
+#    H5DUMP-torderattr2               #uses runTest.cmake
+#    H5DUMP-torderattr3               #uses runTest.cmake
+#    H5DUMP-torderattr4               #uses runTest.cmake
+#    H5DUMP-tfpformat                 #uses runTest.cmake
+#    H5DUMP-textlinksrc               #uses runTest.cmake
+#    H5DUMP-textlinkfar               #uses runTest.cmake
+#    H5DUMP-textlink                  #uses runTest.cmake
+#    H5DUMP_PACKED_BITS-clearall-objects
+#    H5DUMP-tpackedbits               #uses runTest.cmake
+#    H5DUMP-tpackedbits2              #uses runTest.cmake
     H5DUMP-tnofilename-with-packed-bits     #uses runTest.cmake
     H5DUMP-tpbitsSigned              #uses runTest.cmake
     H5DUMP-tpbitsUnsigned            #uses runTest.cmake
@@ -317,69 +317,69 @@ SET (CTEST_CUSTOM_MEMCHECK_IGNORE
     H5DUMP-tpbitsLengthExceeded      #uses runTest.cmake
     H5DUMP-tpbitsIncomplete          #uses runTest.cmake
     H5DUMP-XML-clearall-objects
-    H5DUMP-XML-tall.h5               #uses runTest.cmake
-    H5DUMP-XML-tattr.h5              #uses runTest.cmake
-    H5DUMP-XML-tbitfields.h5         #uses runTest.cmake
-    H5DUMP-XML-tcompound.h5          #uses runTest.cmake
-    H5DUMP-XML-tcompound2.h5         #uses runTest.cmake
-    H5DUMP-XML-tdatareg.h5           #uses runTest.cmake
-    H5DUMP-XML-tdset.h5              #uses runTest.cmake
-    H5DUMP-XML-tdset2.h5             #uses runTest.cmake
-    H5DUMP-XML-tenum.h5              #uses runTest.cmake
-    H5DUMP-XML-tgroup.h5             #uses runTest.cmake
-    H5DUMP-XML-thlink.h5             #uses runTest.cmake
-    H5DUMP-XML-tloop.h5              #uses runTest.cmake
-    H5DUMP-XML-tloop2.h5             #uses runTest.cmake
-    H5DUMP-XML-tmany.h5              #uses runTest.cmake
-    H5DUMP-XML-tnestedcomp.h5        #uses runTest.cmake
-    H5DUMP-XML-tcompound_complex.h5  #uses runTest.cmake
-    H5DUMP-XML-tobjref.h5            #uses runTest.cmake
-    H5DUMP-XML-topaque.h5            #uses runTest.cmake
-    H5DUMP-XML-tslink.h5             #uses runTest.cmake
-    H5DUMP-XML-tudlink.h5            #uses runTest.cmake
-    H5DUMP-XML-textlink.h5           #uses runTest.cmake
-    H5DUMP-XML-tstr.h5               #uses runTest.cmake
-    H5DUMP-XML-tstr2.h5              #uses runTest.cmake
-    H5DUMP-XML-tref.h5               #uses runTest.cmake
-    H5DUMP-XML-tname-amp.h5          #uses runTest.cmake
-    H5DUMP-XML-tname-apos.h5         #uses runTest.cmake
-    H5DUMP-XML-tname-gt.h5           #uses runTest.cmake
-    H5DUMP-XML-tname-lt.h5           #uses runTest.cmake
-    H5DUMP-XML-tname-quot.h5         #uses runTest.cmake
-    H5DUMP-XML-tname-sp.h5           #uses runTest.cmake
-    H5DUMP-XML-tstring.h5            #uses runTest.cmake
-    H5DUMP-XML-tstring-at.h5         #uses runTest.cmake
-    H5DUMP-XML-tref-escapes.h5       #uses runTest.cmake
-    H5DUMP-XML-tref-escapes-at.h5    #uses runTest.cmake
-    H5DUMP-XML-tnodata.h5            #uses runTest.cmake
-    H5DUMP-XML-tarray1.h5            #uses runTest.cmake
-    H5DUMP-XML-tarray2.h5            #uses runTest.cmake
-    H5DUMP-XML-tarray3.h5            #uses runTest.cmake
-    H5DUMP-XML-tarray6.h5            #uses runTest.cmake
-    H5DUMP-XML-tarray7.h5            #uses runTest.cmake
-    H5DUMP-XML-tvldtypes1.h5         #uses runTest.cmake
-    H5DUMP-XML-tvldtypes2.h5         #uses runTest.cmake
-    H5DUMP-XML-tvldtypes3.h5         #uses runTest.cmake
-    H5DUMP-XML-tvldtypes4.h5         #uses runTest.cmake
-    H5DUMP-XML-tvldtypes5.h5         #uses runTest.cmake
-    H5DUMP-XML-tvlstr.h5             #uses runTest.cmake
-    H5DUMP-XML-tsaf.h5               #uses runTest.cmake
-    H5DUMP-XML-tempty.h5             #uses runTest.cmake
-    H5DUMP-XML-tnamed_dtype_attr.h5  #uses runTest.cmake
-    H5DUMP-XML-tempty-dtd.h5         #uses runTest.cmake
-    H5DUMP-XML-tempty-dtd-2.h5       #uses runTest.cmake
-    H5DUMP-XML-tempty-nons.h5        #uses runTest.cmake
-    H5DUMP-XML-tempty-nons-2.h5      #uses runTest.cmake
-    H5DUMP-XML-tempty-ns.h5          #uses runTest.cmake
-    H5DUMP-XML-tempty-ns-2.h5        #uses runTest.cmake
-    H5DUMP-XML-tempty-nons-uri.h5    #uses runTest.cmake
-    H5DUMP-XML-tempty-dtd-uri.h5     #uses runTest.cmake
-    H5DUMP-XML-tall-2A.h5            #uses runTest.cmake
-    H5DUMP-XML-torderattr1.h5        #uses runTest.cmake
-    H5DUMP-XML-torderattr2.h5        #uses runTest.cmake
-    H5DUMP-XML-torderattr3.h5        #uses runTest.cmake
-    H5DUMP-XML-torderattr4.h5        #uses runTest.cmake
-    H5DUMP-XML-tfpformat.h5          #uses runTest.cmake
+#    H5DUMP-XML-tall.h5               #uses runTest.cmake
+#    H5DUMP-XML-tattr.h5              #uses runTest.cmake
+#    H5DUMP-XML-tbitfields.h5         #uses runTest.cmake
+#    H5DUMP-XML-tcompound.h5          #uses runTest.cmake
+#    H5DUMP-XML-tcompound2.h5         #uses runTest.cmake
+#    H5DUMP-XML-tdatareg.h5           #uses runTest.cmake
+#    H5DUMP-XML-tdset.h5              #uses runTest.cmake
+#    H5DUMP-XML-tdset2.h5             #uses runTest.cmake
+#    H5DUMP-XML-tenum.h5              #uses runTest.cmake
+#    H5DUMP-XML-tgroup.h5             #uses runTest.cmake
+#    H5DUMP-XML-thlink.h5             #uses runTest.cmake
+#    H5DUMP-XML-tloop.h5              #uses runTest.cmake
+#    H5DUMP-XML-tloop2.h5             #uses runTest.cmake
+#    H5DUMP-XML-tmany.h5              #uses runTest.cmake
+#    H5DUMP-XML-tnestedcomp.h5        #uses runTest.cmake
+#    H5DUMP-XML-tcompound_complex.h5  #uses runTest.cmake
+#    H5DUMP-XML-tobjref.h5            #uses runTest.cmake
+#    H5DUMP-XML-topaque.h5            #uses runTest.cmake
+#    H5DUMP-XML-tslink.h5             #uses runTest.cmake
+#    H5DUMP-XML-tudlink.h5            #uses runTest.cmake
+#    H5DUMP-XML-textlink.h5           #uses runTest.cmake
+#    H5DUMP-XML-tstr.h5               #uses runTest.cmake
+#    H5DUMP-XML-tstr2.h5              #uses runTest.cmake
+#    H5DUMP-XML-tref.h5               #uses runTest.cmake
+#    H5DUMP-XML-tname-amp.h5          #uses runTest.cmake
+#    H5DUMP-XML-tname-apos.h5         #uses runTest.cmake
+#    H5DUMP-XML-tname-gt.h5           #uses runTest.cmake
+#    H5DUMP-XML-tname-lt.h5           #uses runTest.cmake
+#    H5DUMP-XML-tname-quot.h5         #uses runTest.cmake
+#    H5DUMP-XML-tname-sp.h5           #uses runTest.cmake
+#    H5DUMP-XML-tstring.h5            #uses runTest.cmake
+#    H5DUMP-XML-tstring-at.h5         #uses runTest.cmake
+#    H5DUMP-XML-tref-escapes.h5       #uses runTest.cmake
+#    H5DUMP-XML-tref-escapes-at.h5    #uses runTest.cmake
+#    H5DUMP-XML-tnodata.h5            #uses runTest.cmake
+#    H5DUMP-XML-tarray1.h5            #uses runTest.cmake
+#    H5DUMP-XML-tarray2.h5            #uses runTest.cmake
+#    H5DUMP-XML-tarray3.h5            #uses runTest.cmake
+#    H5DUMP-XML-tarray6.h5            #uses runTest.cmake
+#    H5DUMP-XML-tarray7.h5            #uses runTest.cmake
+#    H5DUMP-XML-tvldtypes1.h5         #uses runTest.cmake
+#    H5DUMP-XML-tvldtypes2.h5         #uses runTest.cmake
+#    H5DUMP-XML-tvldtypes3.h5         #uses runTest.cmake
+#    H5DUMP-XML-tvldtypes4.h5         #uses runTest.cmake
+#    H5DUMP-XML-tvldtypes5.h5         #uses runTest.cmake
+#    H5DUMP-XML-tvlstr.h5             #uses runTest.cmake
+#    H5DUMP-XML-tsaf.h5               #uses runTest.cmake
+#    H5DUMP-XML-tempty.h5             #uses runTest.cmake
+#    H5DUMP-XML-tnamed_dtype_attr.h5  #uses runTest.cmake
+#    H5DUMP-XML-tempty-dtd.h5         #uses runTest.cmake
+#    H5DUMP-XML-tempty-dtd-2.h5       #uses runTest.cmake
+#    H5DUMP-XML-tempty-nons.h5        #uses runTest.cmake
+#    H5DUMP-XML-tempty-nons-2.h5      #uses runTest.cmake
+#    H5DUMP-XML-tempty-ns.h5          #uses runTest.cmake
+#    H5DUMP-XML-tempty-ns-2.h5        #uses runTest.cmake
+#    H5DUMP-XML-tempty-nons-uri.h5    #uses runTest.cmake
+#    H5DUMP-XML-tempty-dtd-uri.h5     #uses runTest.cmake
+#    H5DUMP-XML-tall-2A.h5            #uses runTest.cmake
+#    H5DUMP-XML-torderattr1.h5        #uses runTest.cmake
+#    H5DUMP-XML-torderattr2.h5        #uses runTest.cmake
+#    H5DUMP-XML-torderattr3.h5        #uses runTest.cmake
+#    H5DUMP-XML-torderattr4.h5        #uses runTest.cmake
+#    H5DUMP-XML-tfpformat.h5          #uses runTest.cmake
     ######### tools/h5import #########
     H5IMPORT-clear-objects
     ######### tools/h5ls #########
diff --git a/config/cmake/HDFMacros.cmake b/config/cmake/HDFMacros.cmake
index 4adc455..60ee6e8 100644
--- a/config/cmake/HDFMacros.cmake
+++ b/config/cmake/HDFMacros.cmake
@@ -81,14 +81,28 @@ MACRO (EXTERNAL_SZIP_LIBRARY compress_type libtype encoding)
   ENDIF (${compress_type} MATCHES "SVN")
   EXTERNALPROJECT_GET_PROPERTY (SZIP BINARY_DIR SOURCE_DIR) 
 
+  IF (${BLDTYPE} MATCHES "Debug")
+    IF (WIN32 AND NOT MINGW)
+      IF (HDF_LEGACY_NAMING)
+        SET (DBG_EXT "d")
+      ELSE (HDF_LEGACY_NAMING)
+        SET (DBG_EXT "_D")
+      ENDIF (HDF_LEGACY_NAMING)
+    ELSE (WIN32 AND NOT MINGW)
+      SET (DBG_EXT "_debug")
+    ENDIF (WIN32 AND NOT MINGW)
+  ELSE (${BLDTYPE} MATCHES "Debug")
+    SET (DBG_EXT "")
+  ENDIF (${BLDTYPE} MATCHES "Debug")
+
   IF (${libtype} MATCHES "SHARED")
     IF (WIN32 AND NOT MINGW)
-      SET (SZIP_LIBRARY "${BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/${CMAKE_IMPORT_LIBRARY_PREFIX}szip${CMAKE_IMPORT_LIBRARY_SUFFIX}")
+      SET (SZIP_LIBRARY "${BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/${CMAKE_IMPORT_LIBRARY_PREFIX}szip${DBG_EXT}${CMAKE_IMPORT_LIBRARY_SUFFIX}")
     ELSE (WIN32 AND NOT MINGW)
-      SET (SZIP_LIBRARY "${BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}szip${CMAKE_SHARED_LIBRARY_SUFFIX}")
+      SET (SZIP_LIBRARY "${BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}szip${DBG_EXT}${CMAKE_SHARED_LIBRARY_SUFFIX}")
     ENDIF (WIN32 AND NOT MINGW)
   ELSE (${libtype} MATCHES "SHARED")
-      SET (SZIP_LIBRARY "${BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/libszip${CMAKE_STATIC_LIBRARY_SUFFIX}")
+      SET (SZIP_LIBRARY "${BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/libszip${DBG_EXT}${CMAKE_STATIC_LIBRARY_SUFFIX}")
   ENDIF (${libtype} MATCHES "SHARED")
   SET (SZIP_INCLUDE_DIR_GEN "${BINARY_DIR}")
   SET (SZIP_INCLUDE_DIR "${SOURCE_DIR}/src")
@@ -155,21 +169,35 @@ MACRO (EXTERNAL_ZLIB_LIBRARY compress_type libtype)
   ENDIF (${compress_type} MATCHES "SVN")
   EXTERNALPROJECT_GET_PROPERTY (ZLIB BINARY_DIR SOURCE_DIR) 
 
+  IF (${BLDTYPE} MATCHES "Debug")
+    IF (WIN32 AND NOT MINGW)
+      IF (HDF_LEGACY_NAMING)
+        SET (DBG_EXT "d")
+      ELSE (HDF_LEGACY_NAMING)
+        SET (DBG_EXT "_D")
+      ENDIF (HDF_LEGACY_NAMING)
+    ELSE (WIN32 AND NOT MINGW)
+      SET (DBG_EXT "_debug")
+    ENDIF (WIN32 AND NOT MINGW)
+  ELSE (${BLDTYPE} MATCHES "Debug")
+    SET (DBG_EXT "")
+  ENDIF (${BLDTYPE} MATCHES "Debug")
+  
   IF (${libtype} MATCHES "SHARED")
     IF (WIN32 AND NOT MINGW)
-      SET (ZLIB_LIBRARY "${BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/${CMAKE_IMPORT_LIBRARY_PREFIX}zlib1${CMAKE_IMPORT_LIBRARY_SUFFIX}")
+      SET (ZLIB_LIBRARY "${BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/${CMAKE_IMPORT_LIBRARY_PREFIX}zlib1${DBG_EXT}${CMAKE_IMPORT_LIBRARY_SUFFIX}")
     ELSE (WIN32 AND NOT MINGW)
-      SET (ZLIB_LIBRARY "${BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}z${CMAKE_SHARED_LIBRARY_SUFFIX}")
+      SET (ZLIB_LIBRARY "${BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}z${DBG_EXT}${CMAKE_SHARED_LIBRARY_SUFFIX}")
     ENDIF (WIN32 AND NOT MINGW)
   ELSE (${libtype} MATCHES "SHARED")
     IF (WIN32 AND NOT MINGW)
       IF (HDF_LEGACY_NAMING)
-        SET (ZLIB_LIBRARY "${BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/zlib${CMAKE_STATIC_LIBRARY_SUFFIX}")
+        SET (ZLIB_LIBRARY "${BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/zlib${DBG_EXT}${CMAKE_STATIC_LIBRARY_SUFFIX}")
       ELSE (HDF_LEGACY_NAMING)
-        SET (ZLIB_LIBRARY "${BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/libzlib${CMAKE_STATIC_LIBRARY_SUFFIX}")
+        SET (ZLIB_LIBRARY "${BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/libzlib${DBG_EXT}${CMAKE_STATIC_LIBRARY_SUFFIX}")
       ENDIF (HDF_LEGACY_NAMING)
     ELSE (WIN32 AND NOT MINGW)
-      SET (ZLIB_LIBRARY "${BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/libz${CMAKE_STATIC_LIBRARY_SUFFIX}")
+      SET (ZLIB_LIBRARY "${BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/libz${DBG_EXT}${CMAKE_STATIC_LIBRARY_SUFFIX}")
     ENDIF (WIN32 AND NOT MINGW)
   ENDIF (${libtype} MATCHES "SHARED")
   SET (ZLIB_INCLUDE_DIR_GEN "${BINARY_DIR}")