[svn-r20383] Description:

    Bring r19714:20382 from trunk to revise_chunks branch

Tested:
    Linux 2.6/64 (chicago)

5 files changed, 524 insertions, 549 deletions

diff --git a/config/cmake/CTestCustom.cmake b/config/cmake/CTestCustom.cmake
index 68b0642..6dae1ce 100755
--- a/config/cmake/CTestCustom.cmake
+++ b/config/cmake/CTestCustom.cmake
@@ -26,418 +26,159 @@ SET (CTEST_CUSTOM_MEMCHECK_IGNORE
     hl_fortran_test-clear-objects
     ######### tools/h5copy #########
     H5COPY-clearall-objects
-    H5COPY-H5LS_h5copytst-basic       #uses runTest.cmake
     H5COPY-clear-refs
-    H5COPY-region_ref                 #needs clear-refs
-    H5COPY-H5LS_h5copy_ref-refs       #uses runTest.cmake
     H5COPY-clear-ext-links
-    H5COPY-ext_link                   #needs clear-ext-links
-    H5COPY-ext_link_f                 #needs clear-ext-links
-    H5COPY-ext_dangle_noobj           #needs clear-ext-links
-    H5COPY-ext_dangle_noobj_f         #needs clear-ext-links
-    H5COPY-ext_dangle_nofile          #needs clear-ext-links
-    H5COPY-ext_dangle_nofile_f        #needs clear-ext-links
-    H5COPY-ext_link_group             #needs clear-ext-links
-    H5COPY-ext_link_group_f           #needs clear-ext-links
-    H5COPY-H5LS_h5copy_extlinks_src-links    #uses runTest.cmake
     H5COPY-clear-misc
-    H5COPY-CMP-h5copy_misc1           #uses runTest.cmake
     ######### tools/h5diff #########
     H5DIFF-clearall-objects
-    H5DIFF-h5diff_10      #uses runTest.cmake
-    H5DIFF-h5diff_11      #uses runTest.cmake
-    H5DIFF-h5diff_12      #uses runTest.cmake
-    H5DIFF-h5diff_13      #uses runTest.cmake
-    H5DIFF-h5diff_14      #uses runTest.cmake
-    H5DIFF-h5diff_15      #uses runTest.cmake
-    H5DIFF-h5diff_16_1    #uses runTest.cmake
-    H5DIFF-h5diff_16_2    #uses runTest.cmake
-    H5DIFF-h5diff_16_3    #uses runTest.cmake
-    H5DIFF-h5diff_17      #uses runTest.cmake
-    H5DIFF-h5diff_171     #uses runTest.cmake
-    H5DIFF-h5diff_172     #uses runTest.cmake
-    H5DIFF-h5diff_18      #uses runTest.cmake
-    H5DIFF-h5diff_18_1    #uses runTest.cmake
-    H5DIFF-h5diff_20      #uses runTest.cmake
-    H5DIFF-h5diff_21      #uses runTest.cmake
-    H5DIFF-h5diff_22      #uses runTest.cmake
-    H5DIFF-h5diff_23      #uses runTest.cmake
-    H5DIFF-h5diff_24      #uses runTest.cmake
-    H5DIFF-h5diff_25      #uses runTest.cmake
-    H5DIFF-h5diff_26      #uses runTest.cmake
-    H5DIFF-h5diff_27      #uses runTest.cmake
-    H5DIFF-h5diff_28      #uses runTest.cmake
-    H5DIFF-h5diff_50      #uses runTest.cmake
-    H5DIFF-h5diff_51      #uses runTest.cmake
-    H5DIFF-h5diff_52      #uses runTest.cmake
-    H5DIFF-h5diff_53      #uses runTest.cmake
-    H5DIFF-h5diff_54      #uses runTest.cmake
-    H5DIFF-h5diff_55      #uses runTest.cmake
-    H5DIFF-h5diff_56      #uses runTest.cmake
-    H5DIFF-h5diff_57      #uses runTest.cmake
-    H5DIFF-h5diff_58      #uses runTest.cmake
-    H5DIFF-h5diff_600     #uses runTest.cmake
-    H5DIFF-h5diff_601     #uses runTest.cmake
-    H5DIFF-h5diff_603     #uses runTest.cmake
-    H5DIFF-h5diff_604     #uses runTest.cmake
-    H5DIFF-h5diff_605     #uses runTest.cmake
-    H5DIFF-h5diff_606     #uses runTest.cmake
-    H5DIFF-h5diff_607     #uses runTest.cmake
-    H5DIFF-h5diff_608     #uses runTest.cmake
-    H5DIFF-h5diff_609     #uses runTest.cmake
-    H5DIFF-h5diff_610     #uses runTest.cmake
-    H5DIFF-h5diff_612     #uses runTest.cmake
-    H5DIFF-h5diff_613     #uses runTest.cmake
-    H5DIFF-h5diff_614     #uses runTest.cmake
-    H5DIFF-h5diff_615     #uses runTest.cmake
-    H5DIFF-h5diff_616     #uses runTest.cmake
-    H5DIFF-h5diff_617     #uses runTest.cmake
-    H5DIFF-h5diff_618     #uses runTest.cmake
-    H5DIFF-h5diff_619     #uses runTest.cmake
-    H5DIFF-h5diff_621     #uses runTest.cmake
-    H5DIFF-h5diff_622     #uses runTest.cmake
-    H5DIFF-h5diff_623     #uses runTest.cmake
-    H5DIFF-h5diff_624     #uses runTest.cmake
-    H5DIFF-h5diff_625     #uses runTest.cmake
-    H5DIFF-h5diff_626     #uses runTest.cmake
-    H5DIFF-h5diff_627     #uses runTest.cmake
-    H5DIFF-h5diff_628     #uses runTest.cmake
-    H5DIFF-h5diff_70      #uses runTest.cmake
-    H5DIFF-h5diff_80      #uses runTest.cmake
-    H5DIFF-h5diff_90      #uses runTest.cmake
-    H5DIFF-h5diff_101     #uses runTest.cmake
-    H5DIFF-h5diff_102     #uses runTest.cmake
-    H5DIFF-h5diff_200     #uses runTest.cmake
-    H5DIFF-h5diff_201     #uses runTest.cmake
-    H5DIFF-h5diff_202     #uses runTest.cmake
-    H5DIFF-h5diff_203     #uses runTest.cmake
-    H5DIFF-h5diff_204     #uses runTest.cmake
-    H5DIFF-h5diff_205     #uses runTest.cmake
-    H5DIFF-h5diff_206     #uses runTest.cmake
-    H5DIFF-h5diff_207     #uses runTest.cmake
-    H5DIFF-h5diff_300     #uses runTest.cmake
-    H5DIFF-h5diff_400     #uses runTest.cmake
-    H5DIFF-h5diff_401     #uses runTest.cmake
-    H5DIFF-h5diff_402     #uses runTest.cmake
-    H5DIFF-h5diff_403     #uses runTest.cmake
-    H5DIFF-h5diff_404     #uses runTest.cmake
-    H5DIFF-h5diff_405     #uses runTest.cmake
-    H5DIFF-h5diff_406     #uses runTest.cmake
-    H5DIFF-h5diff_407     #uses runTest.cmake
-    H5DIFF-h5diff_408     #uses runTest.cmake
-    H5DIFF-h5diff_409     #uses runTest.cmake
-    H5DIFF-h5diff_410     #uses runTest.cmake
-    H5DIFF-h5diff_411     #uses runTest.cmake
-    H5DIFF-h5diff_412     #uses runTest.cmake
-    H5DIFF-h5diff_413     #uses runTest.cmake
-    H5DIFF-h5diff_414     #uses runTest.cmake
-    H5DIFF-h5diff_415     #uses runTest.cmake
-    H5DIFF-h5diff_416     #uses runTest.cmake
-    H5DIFF-h5diff_417     #uses runTest.cmake
-    H5DIFF-h5diff_418     #uses runTest.cmake
-    H5DIFF-h5diff_419     #uses runTest.cmake
-    H5DIFF-h5diff_420     #uses runTest.cmake
-    H5DIFF-h5diff_421     #uses runTest.cmake
-    H5DIFF-h5diff_422     #uses runTest.cmake
-    H5DIFF-h5diff_423     #uses runTest.cmake
-    H5DIFF-h5diff_424     #uses runTest.cmake
-    H5DIFF-h5diff_425     #uses runTest.cmake
-    H5DIFF-h5diff_450     #uses runTest.cmake
-    H5DIFF-h5diff_451     #uses runTest.cmake
-    H5DIFF-h5diff_452     #uses runTest.cmake
-    H5DIFF-h5diff_453     #uses runTest.cmake
-    H5DIFF-h5diff_454     #uses runTest.cmake
-    H5DIFF-h5diff_455     #uses runTest.cmake
-    H5DIFF-h5diff_456     #uses runTest.cmake
-    H5DIFF-h5diff_457     #uses runTest.cmake
-    H5DIFF-h5diff_458     #uses runTest.cmake
-    H5DIFF-h5diff_459     #uses runTest.cmake
-    H5DIFF-h5diff_500     #uses runTest.cmake
-    H5DIFF-h5diff_501     #uses runTest.cmake
-    H5DIFF-h5diff_502     #uses runTest.cmake
-    H5DIFF-h5diff_503     #uses runTest.cmake
-    H5DIFF-h5diff_504     #uses runTest.cmake
-    H5DIFF-h5diff_505     #uses runTest.cmake
-    H5DIFF-h5diff_506     #uses runTest.cmake
-    H5DIFF-h5diff_507     #uses runTest.cmake
-    H5DIFF-h5diff_508     #uses runTest.cmake
-    H5DIFF-h5diff_509     #uses runTest.cmake
-    H5DIFF-h5diff_510     #uses runTest.cmake
-    H5DIFF-h5diff_511     #uses runTest.cmake
-    H5DIFF-h5diff_512     #uses runTest.cmake
-    H5DIFF-h5diff_513     #uses runTest.cmake
-    H5DIFF-h5diff_514     #uses runTest.cmake
-    H5DIFF-h5diff_515     #uses runTest.cmake
-    H5DIFF-h5diff_516     #uses runTest.cmake
-    H5DIFF-h5diff_517     #uses runTest.cmake
-    H5DIFF-h5diff_518     #uses runTest.cmake
-    H5DIFF-h5diff_480     #uses runTest.cmake
-    H5DIFF-h5diff_481     #uses runTest.cmake
-    H5DIFF-h5diff_482     #uses runTest.cmake
-    H5DIFF-h5diff_483     #uses runTest.cmake
-    H5DIFF-h5diff_484     #uses runTest.cmake
-    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-tnofilename-with-packed-bits     #uses runTest.cmake
-    H5DUMP-tpbitsSigned              #uses runTest.cmake
-    H5DUMP-tpbitsUnsigned            #uses runTest.cmake
-    H5DUMP-tpbitsOverlapped          #uses runTest.cmake
-    H5DUMP-tpbitsMax                 #uses runTest.cmake
-    H5DUMP-tpbitsCompound            #uses runTest.cmake
-    H5DUMP-tpbitsArray               #uses runTest.cmake
-    H5DUMP-tpbitsMaxExceeded         #uses runTest.cmake
-    H5DUMP-tpbitsOffsetExceeded      #uses runTest.cmake
-    H5DUMP-tpbitsOffsetNegative      #uses runTest.cmake
-    H5DUMP-tpbitsLengthPositive      #uses runTest.cmake
-    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
     ######### tools/h5import #########
     H5IMPORT-clear-objects
+    H5IMPORT-ASCII_F32-clear-objects
+    H5IMPORT-ASCII_UI16-clear-objects
+    H5IMPORT-ASCII_UI32-clear-objects
+    H5IMPORT-ASCII_I8-clear-objects
+    H5IMPORT-ASCII_I16-clear-objects
+    H5IMPORT-ASCII_I32-clear-objects
+    H5IMPORT-ASCII_F64_R1-clear-objects
+    H5IMPORT-BINARY_I8_EOF-clear-objects
+    H5IMPORT-STR-clear-objects
+    H5IMPORT-BINARY_UI32-clear-objects
+    H5IMPORT-BINARY_UI16-clear-objects
+    H5IMPORT-BINARY_I32-clear-objects
+    H5IMPORT-BINARY_I8-clear-objects
+    H5IMPORT-BINARY_I16-clear-objects
+    H5IMPORT-BINARY_F64-clear-objects
+    H5IMPORT-ASCII_F64-clear-objects
+    ######### tools/h5jam #########
+    H5JAM-SETUP-N_twithub_u511_c-clear-objects
+    H5JAM-SETUP-N_twithub_u511_c
+    H5JAM-N_twithub_u511_c-clear-objects
+    H5JAM-CHECKFILE-N_twithub_u511_c-clear-objects
+    H5JAM-SETUP-N_twithub_u512_c-clear-objects
+    H5JAM-SETUP-N_twithub_u512_c
+    H5JAM-N_twithub_u512_c-clear-objects
+    H5JAM-CHECKFILE-N_twithub_u512_c-clear-objects
+    H5JAM-SETUP-N_twithub_u513_c-clear-objects
+    H5JAM-SETUP-N_twithub_u513_c
+    H5JAM-N_twithub_u513_c-clear-objects
+    H5JAM-CHECKFILE-N_twithub_u513_c-clear-objects
+    H5JAM-SETUP-N_twithub513_u10_c-clear-objects
+    H5JAM-SETUP-N_twithub513_u10_c
+    H5JAM-N_twithub513_u10_c-clear-objects
+    H5JAM-CHECKFILE-N_twithub513_u10_c-clear-objects
+    H5JAM-SETUP-N_twithub513_u511_c-clear-objects
+    H5JAM-SETUP-N_twithub513_u511_c
+    H5JAM-N_twithub513_u511_c-clear-objects
+    H5JAM-CHECKFILE-N_twithub513_u511_c-clear-objects
+    H5JAM-SETUP-N_twithub513_u512_c-clear-objects
+    H5JAM-SETUP-N_twithub513_u512_c
+    H5JAM-N_twithub513_u512_c-clear-objects
+    H5JAM-CHECKFILE-N_twithub513_u512_c-clear-objects
+    H5JAM-SETUP-N_twithub513_u513_c-clear-objects
+    H5JAM-SETUP-N_twithub513_u513_c
+    H5JAM-N_twithub513_u513_c-clear-objects
+    H5JAM-CHECKFILE-N_twithub513_u513_c-clear-objects
+    H5JAM-CHECKFILE-twithub_u10_c-clear-objects
+    H5JAM-twithub_u511_c-clear-objects
+    H5JAM-CHECKFILE-twithub_u511_c-clear-objects
+    H5JAM-twithub_u512_c-clear-objects
+    H5JAM-CHECKFILE-twithub_u512_c-clear-objects
+    H5JAM-twithub_u513_c-clear-objects
+    H5JAM-CHECKFILE-twithub_u513_c-clear-objects
+    H5JAM-twithub513_u10_c-clear-objects
+    H5JAM-CHECKFILE-twithub513_u10_c-clear-objects
+    H5JAM-twithub513_u511_c-clear-objects
+    H5JAM-CHECKFILE-twithub513_u511_c-clear-objects
+    H5JAM-twithub513_u512_c-clear-objects
+    H5JAM-CHECKFILE-twithub513_u512_c-clear-objects
+    H5JAM-twithub513_u513_c-clear-objects
+    H5JAM-CHECKFILE-twithub513_u513_c-clear-objects
+    H5JAM-SETUP-N_twithub_u10_c-clear-objects
+    H5JAM-SETUP-N_twithub_u10_c
+    H5JAM-N_twithub_u10_c-clear-objects
+    H5JAM-CHECKFILE-N_twithub_u10_c-clear-objects
+    H5JAM-SETUP-twithub_tall-clear-objects
+    H5JAM-SETUP-twithub_tall
+    H5JAM-UNJAM-twithub_tall-clear-objects
+    H5JAM-UNJAM_D-twithub_tall-clear-objects
+    H5JAM-CHECKFILE-twithub_tall-clear-objects
+    H5JAM-SETUP-twithub513_tall-clear-objects
+    H5JAM-SETUP-twithub513_tall
+    H5JAM-UNJAM-twithub513_tall-clear-objects
+    H5JAM-UNJAM_D-twithub513_tall-clear-objects
+    H5JAM-CHECKFILE-twithub513_tall-clear-objects
+    H5JAM-SETUP-N_twithub_tall-clear-objects
+    H5JAM-SETUP-N_twithub_tall
+    H5JAM-UNJAM-N_twithub_tall-clear-objects
+    H5JAM-UNJAM_D-N_twithub_tall-clear-objects
+    H5JAM-CHECKFILE-N_twithub_tall-clear-objects
+    H5JAM-SETUP-N_twithub513_tall-clear-objects
+    H5JAM-SETUP-N_twithub513_tall
+    H5JAM-UNJAM-N_twithub513_tall-clear-objects
+    H5JAM-UNJAM_D-N_twithub513_tall-clear-objects
+    H5JAM-CHECKFILE-N_twithub513_tall-clear-objects
+    H5JAM-SETUP-D_twithub_tall-clear-objects
+    H5JAM-UNJAM-D_twithub_tall-clear-objects
+    H5JAM-UNJAM_D-D_twithub_tall-clear-objects
+    H5JAM-CHECKFILE-D_twithub_tall-clear-objects
+    H5JAM-SETUP-D_twithub513_tall-clear-objects
+    H5JAM-SETUP-D_twithub513_tall
+    H5JAM-UNJAM-D_twithub513_tall-clear-objects
+    H5JAM-UNJAM_D-D_twithub513_tall-clear-objects
+    H5JAM-CHECKFILE-D_twithub513_tall-clear-objects
+    H5JAM-CHECKFILE-ta_u513-clear-objects
+    H5JAM-twithub_u10-clear-objects
+    H5JAM-CHECKFILE-twithub_u10-clear-objects
+    H5JAM-twithub_u511-clear-objects
+    H5JAM-CHECKFILE-twithub_u511-clear-objects
+    H5JAM-twithub_u512-clear-objects
+    H5JAM-CHECKFILE-twithub_u512-clear-objects
+    H5JAM-twithub_u513-clear-objects
+    H5JAM-CHECKFILE-twithub_u513-clear-objects
+    H5JAM-twithub513_u10-clear-objects
+    H5JAM-CHECKFILE-twithub513_u10-clear-objects
+    H5JAM-twithub513_u511-clear-objects
+    H5JAM-CHECKFILE-twithub513_u511-clear-objects
+    H5JAM-twithub513_u512-clear-objects
+    H5JAM-CHECKFILE-twithub513_u512-clear-objects
+    H5JAM-twithub513_u513-clear-objects
+    H5JAM-CHECKFILE-twithub513_u513-clear-objects
+    H5JAM-twithub_u10_c-clear-objects
+    H5JAM-tall_u10-clear-objects
+    H5JAM-CHECKFILE-tall_u10-clear-objects
+    H5JAM-tall_u511-clear-objects
+    H5JAM-CHECKFILE-tall_u511-clear-objects
+    H5JAM-tall_u512-clear-objects
+    H5JAM-CHECKFILE-tall_u512-clear-objects
+    H5JAM-tall_u513-clear-objects
+    H5JAM-CHECKFILE-tall_u513-clear-objects
+    H5JAM-SETUP-ta_u10-clear-objects
+    H5JAM-SETUP-ta_u10
+    H5JAM-ta_u10-clear-objects
+    H5JAM-CHECKFILE-ta_u10-clear-objects
+    H5JAM-SETUP-ta_u511-clear-objects
+    H5JAM-SETUP-ta_u511
+    H5JAM-ta_u511-clear-objects
+    H5JAM-CHECKFILE-ta_u511-clear-objects
+    H5JAM-SETUP-ta_u512-clear-objects
+    H5JAM-SETUP-ta_u512
+    H5JAM-ta_u512-clear-objects
+    H5JAM-CHECKFILE-ta_u512-clear-objects
+    H5JAM-SETUP-ta_u513-clear-objects
+    H5JAM-SETUP-ta_u513
+    H5JAM-ta_u513-clear-objects
     ######### tools/h5ls #########
     H5LS-clearall-objects
-    H5LS-help-1                     #uses runTest.cmake
-    H5LS-help-2                     #uses runTest.cmake
-    H5LS-help-3                     #uses runTest.cmake
-    H5LS-tall-1                     #uses runTest.cmake
-    H5LS-tall-2                     #uses runTest.cmake
-    H5LS-tgroup                     #uses runTest.cmake
-    H5LS-tgroup-3                   #uses runTest.cmake
-    H5LS-tgroup-1                   #uses runTest.cmake
-    H5LS-tgroup-2                   #uses runTest.cmake
-    H5LS-tgrp_comments              #uses runTest.cmake
-    H5LS-tdset-1                    #uses runTest.cmake
-    H5LS-tslink-1                   #uses runTest.cmake
-    H5LS-tsoftlinks-1               #uses runTest.cmake
-    H5LS-tsoftlinks-2               #uses runTest.cmake
-    H5LS-tsoftlinks-3               #uses runTest.cmake
-    H5LS-tsoftlinks-4               #uses runTest.cmake
-    H5LS-tsoftlinks-5               #uses runTest.cmake
-    H5LS-textlink-1                 #uses runTest.cmake
-    H5LS-textlinksrc-1              #uses runTest.cmake
-    H5LS-textlinksrc-2              #uses runTest.cmake
-    H5LS-textlinksrc-3              #uses runTest.cmake
-    H5LS-textlinksrc-4              #uses runTest.cmake
-    H5LS-textlinksrc-5              #uses runTest.cmake
-    H5LS-textlinksrc-6              #uses runTest.cmake
-    H5LS-textlinksrc-7              #uses runTest.cmake
-    H5LS-tudlink-1                  #uses runTest.cmake
-    H5LS-textlinksrc-1-old          #uses runTest.cmake
-    H5LS-textlinksrc-2-old          #uses runTest.cmake
-    H5LS-textlinksrc-3-old          #uses runTest.cmake
-    H5LS-textlinksrc-6-old          #uses runTest.cmake
-    H5LS-textlinksrc-7-old          #uses runTest.cmake
-    H5LS-textlinksrc-nodangle-1     #uses runTest.cmake
-    H5LS-textlinksrc-nodangle-2     #uses runTest.cmake
-    H5LS-tsoftlinks-nodangle-1      #uses runTest.cmake
-    H5LS-thlinks-nodangle-1         #uses runTest.cmake
-    H5LS-thlink-1                   #uses runTest.cmake
-    H5LS-tcomp-1                    #uses runTest.cmake
-    H5LS-tnestcomp-1                #uses runTest.cmake
-    H5LS-tnestcomp-2                #uses runTest.cmake
-    H5LS-tnestcomp-3                #uses runTest.cmake
-    H5LS-tnestcomp-4                #uses runTest.cmake
-    H5LS-tloop-1                    #uses runTest.cmake
-    H5LS-tstr-1                     #uses runTest.cmake
-    H5LS-tsaf                       #uses runTest.cmake
-    H5LS-tvldtypes1                 #uses runTest.cmake
-    H5LS-tarray1                    #uses runTest.cmake
-    H5LS-tempty                     #uses runTest.cmake
-    H5LS-tattr2                     #uses runTest.cmake
-    H5LS-nosuchfile                 #uses runTest.cmake
-    H5LS-tvldtypes2le               #uses runTest.cmake
-    H5LS-tdataregle                 #uses runTest.cmake
     ######### tools/h5repack #########
     H5REPACK-clearall-objects
-    H5REPACK-gzip_verbose_filters                 #uses runTest.cmake
+    H5REPACK-gzip_verbose_filters                       #uses runTest.cmake
     H5REPACK_VERIFY_LAYOUT-dset2_chunk_20x10            #uses grepTest.cmake
     H5REPACK_VERIFY_LAYOUT_ALL-chunk_20x10              #uses grepTest.cmake
     H5REPACK_VERIFY_LAYOUT-dset2_conti                  #uses grepTest.cmake
@@ -459,26 +200,12 @@ SET (CTEST_CUSTOM_MEMCHECK_IGNORE
     H5REPACK_VERIFY_LAYOUT_ALL-layout_short_switches    #uses grepTest.cmake
     ######### tools/h5stat #########
     H5STAT-clearall-objects
-    H5STAT-h5stat_help1            #uses runTest.cmake
-    H5STAT-h5stat_help2            #uses runTest.cmake
-    H5STAT-h5stat_filters          #uses runTest.cmake
-    H5STAT-h5stat_filters-file     #uses runTest.cmake
-    H5STAT-h5stat_filters-F        #uses runTest.cmake
-    H5STAT-h5stat_filters-d        #uses runTest.cmake
-    H5STAT-h5stat_filters-g        #uses runTest.cmake
-    H5STAT-h5stat_filters-dT       #uses runTest.cmake
-    H5STAT-h5stat_filters-UD       #uses runTest.cmake
-    H5STAT-h5stat_filters-UT       #uses runTest.cmake
-    H5STAT-h5stat_tsohm            #uses runTest.cmake
-    H5STAT-h5stat_newgrat          #uses runTest.cmake
-    H5STAT-h5stat_newgrat-UG       #uses runTest.cmake
-    H5STAT-h5stat_newgrat-UA       #uses runTest.cmake
     ######### tools/misc #########
     h5repart_20K-clear-objects
     h5repart_5K-clear-objects
     h5repart_sec2-clear-objects
-    H5MKGRP-h5mkgrp_help                                #uses runTest.cmake
-    H5MKGRP-h5mkgrp_version                             #uses runTest.cmake
+    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
@@ -515,4 +242,7 @@ SET (CTEST_CUSTOM_MEMCHECK_IGNORE
     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
+    ######### examples #########
+    EXAMPLES-clear-objects
+    cpp_ex-clear-objects
 )
diff --git a/config/cmake/HDF5Macros.cmake b/config/cmake/HDF5Macros.cmake
index 3edb3a2..b9e37bb 100644
--- a/config/cmake/HDF5Macros.cmake
+++ b/config/cmake/HDF5Macros.cmake
@@ -1,107 +1,6 @@
 #-------------------------------------------------------------------------------
-MACRO (SET_GLOBAL_VARIABLE name value)
-  SET (${name} ${value} CACHE INTERNAL "Used to pass variables between directories" FORCE)
-ENDMACRO (SET_GLOBAL_VARIABLE)
-
-#-------------------------------------------------------------------------------
-MACRO (IDE_GENERATED_PROPERTIES SOURCE_PATH HEADERS SOURCES)
-  #set(source_group_path "Source/AIM/${NAME}")
-  STRING (REPLACE "/" "\\\\" source_group_path ${SOURCE_PATH})
-  source_group(${source_group_path} FILES ${HEADERS} ${SOURCES})
-
-  #-- The following is needed if we ever start to use OS X Frameworks but only
-  #--  works on CMake 2.6 and greater
-  #SET_PROPERTY (SOURCE ${HEADERS}
-  #       PROPERTY MACOSX_PACKAGE_LOCATION Headers/${NAME}
-  #)
-ENDMACRO (IDE_GENERATED_PROPERTIES)
-
-#-------------------------------------------------------------------------------
-MACRO (IDE_SOURCE_PROPERTIES SOURCE_PATH HEADERS SOURCES)
-  #  INSTALL (FILES ${HEADERS}
-  #       DESTINATION include/R3D/${NAME}
-  #       COMPONENT Headers       
-  #  )
-
-  STRING (REPLACE "/" "\\\\" source_group_path ${SOURCE_PATH}  )
-  source_group (${source_group_path} FILES ${HEADERS} ${SOURCES})
-
-  #-- The following is needed if we ever start to use OS X Frameworks but only
-  #--  works on CMake 2.6 and greater
-  #SET_PROPERTY (SOURCE ${HEADERS}
-  #       PROPERTY MACOSX_PACKAGE_LOCATION Headers/${NAME}
-  #)
-ENDMACRO (IDE_SOURCE_PROPERTIES)
-
-#-------------------------------------------------------------------------------
-MACRO (H5_NAMING target libtype)
-  IF (WIN32 AND NOT MINGW)
-    IF (${libtype} MATCHES "SHARED")
-      IF (H5_LEGACY_NAMING)
-        SET_TARGET_PROPERTIES (${target} PROPERTIES OUTPUT_NAME "dll")
-        SET_TARGET_PROPERTIES (${target} PROPERTIES PREFIX "${target}")
-      ELSE (H5_LEGACY_NAMING)
-        SET_TARGET_PROPERTIES (${target} PROPERTIES OUTPUT_NAME "${target}dll")
-      ENDIF (H5_LEGACY_NAMING)
-    ENDIF (${libtype} MATCHES "SHARED")
-  ENDIF (WIN32 AND NOT MINGW)
-ENDMACRO (H5_NAMING)
-
-#-------------------------------------------------------------------------------
 MACRO (H5_SET_LIB_OPTIONS libtarget libname libtype)
-  # message (STATUS "${libname} libtype: ${libtype}")
-  IF (${libtype} MATCHES "SHARED")
-    IF (WIN32 AND NOT MINGW)
-      IF (H5_LEGACY_NAMING)
-        SET (LIB_RELEASE_NAME "${libname}dll")
-        SET (LIB_DEBUG_NAME "${libname}ddll")
-      ELSE (H5_LEGACY_NAMING)
-        SET (LIB_RELEASE_NAME "${libname}")
-        SET (LIB_DEBUG_NAME "${libname}_D")
-      ENDIF (H5_LEGACY_NAMING)
-    ELSE (WIN32 AND NOT MINGW)
-      SET (LIB_RELEASE_NAME "${libname}")
-      SET (LIB_DEBUG_NAME "${libname}_debug")
-    ENDIF (WIN32 AND NOT MINGW)
-  ELSE (${libtype} MATCHES "SHARED")
-    IF (WIN32 AND NOT MINGW)
-      IF (H5_LEGACY_NAMING)
-        SET (LIB_RELEASE_NAME "${libname}")
-        SET (LIB_DEBUG_NAME "${libname}d")
-      ELSE (H5_LEGACY_NAMING)
-        SET (LIB_RELEASE_NAME "lib${libname}")
-        SET (LIB_DEBUG_NAME "lib${libname}_D")
-      ENDIF (H5_LEGACY_NAMING)
-    ELSE (WIN32 AND NOT MINGW)
-      # if the generator supports configuration types or if the CMAKE_BUILD_TYPE has a value
-      IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-        SET (LIB_RELEASE_NAME "${libname}")
-        SET (LIB_DEBUG_NAME "${libname}_debug")
-      ELSE (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-        SET (LIB_RELEASE_NAME "lib${libname}")
-        SET (LIB_DEBUG_NAME "lib${libname}_debug")
-      ENDIF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-    ENDIF (WIN32 AND NOT MINGW)
-  ENDIF (${libtype} MATCHES "SHARED")
-  
-  SET_TARGET_PROPERTIES (${libtarget}
-      PROPERTIES
-      DEBUG_OUTPUT_NAME          ${LIB_DEBUG_NAME}
-      RELEASE_OUTPUT_NAME        ${LIB_RELEASE_NAME}
-      MINSIZEREL_OUTPUT_NAME     ${LIB_RELEASE_NAME}
-      RELWITHDEBINFO_OUTPUT_NAME ${LIB_RELEASE_NAME}
-  )
-  
-  #----- Use MSVC Naming conventions for Shared Libraries
-  IF (MINGW AND ${libtype} MATCHES "SHARED")
-    SET_TARGET_PROPERTIES (${libtarget}
-        PROPERTIES
-        IMPORT_SUFFIX ".lib"
-        IMPORT_PREFIX ""
-        PREFIX ""
-    )
-  ENDIF (MINGW AND ${libtype} MATCHES "SHARED")
-
+  HDF_SET_LIB_OPTIONS (${libtarget} ${libname} ${libtype})
   IF (${libtype} MATCHES "SHARED")
     IF (WIN32)
       SET (LIBHDF_VERSION ${HDF5_PACKAGE_VERSION_MAJOR})
@@ -125,17 +24,3 @@ MACRO (H5_SET_LIB_OPTIONS libtarget libname libtype)
   ENDIF (APPLE)
 
 ENDMACRO (H5_SET_LIB_OPTIONS)
-
-#-------------------------------------------------------------------------------
-MACRO (TARGET_FORTRAN_WIN_PROPERTIES target addlinkflags)
-  IF (WIN32)
-    IF (MSVC)
-      SET_TARGET_PROPERTIES (${target}
-          PROPERTIES
-              COMPILE_FLAGS "/dll"
-              LINK_FLAGS "/SUBSYSTEM:CONSOLE ${addlinkflags}"
-      ) 
-    ENDIF (MSVC)
-  ENDIF (WIN32)
-ENDMACRO (TARGET_FORTRAN_WIN_PROPERTIES)
-
diff --git a/config/cmake/HDFMacros.cmake b/config/cmake/HDFMacros.cmake
new file mode 100644
index 0000000..60ee6e8
--- /dev/null
+++ b/config/cmake/HDFMacros.cmake
@@ -0,0 +1,357 @@
+#-------------------------------------------------------------------------------
+MACRO (SET_GLOBAL_VARIABLE name value)
+  SET (${name} ${value} CACHE INTERNAL "Used to pass variables between directories" FORCE)
+ENDMACRO (SET_GLOBAL_VARIABLE)
+
+#-------------------------------------------------------------------------------
+MACRO (EXTERNAL_JPEG_LIBRARY compress_type jpeg_pic)
+  # May need to build JPEG with PIC on x64 machines with gcc
+  # Need to use CMAKE_ANSI_CFLAGS define so that compiler test works
+
+  IF (${compress_type} MATCHES "SVN")
+    EXTERNALPROJECT_ADD (JPEG
+        SVN_REPOSITORY ${JPEG_URL}
+        # [SVN_REVISION rev] 
+        INSTALL_COMMAND ""
+        CMAKE_ARGS
+            -DBUILD_SHARED_LIBS:BOOL=OFF
+            -DCMAKE_BUILD_TYPE:STRING="Release"
+            -DCMAKE_ANSI_CFLAGS:STRING="${jpeg_pic}"
+    ) 
+  ELSEIF (${compress_type} MATCHES "TGZ")
+    EXTERNALPROJECT_ADD (JPEG
+        URL ${JPEG_URL}
+        URL_MD5 ""
+        INSTALL_COMMAND ""
+        CMAKE_ARGS
+            -DBUILD_SHARED_LIBS:BOOL=OFF
+            -DCMAKE_BUILD_TYPE:STRING="Release"
+            -DCMAKE_ANSI_CFLAGS:STRING="${jpeg_pic}"
+    ) 
+  ENDIF (${compress_type} MATCHES "SVN")
+  EXTERNALPROJECT_GET_PROPERTY (JPEG BINARY_DIR SOURCE_DIR) 
+
+  SET (JPEG_LIBRARY "${BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/libjpeg${CMAKE_STATIC_LIBRARY_SUFFIX}")
+  SET (JPEG_INCLUDE_DIR_GEN "${BINARY_DIR}")
+  SET (JPEG_INCLUDE_DIR "${SOURCE_DIR}/src")
+  SET (JPEG_FOUND 1)
+  SET (JPEG_LIBRARIES ${JPEG_LIBRARY})
+  SET (JPEG_INCLUDE_DIRS ${JPEG_INCLUDE_DIR_GEN} ${JPEG_INCLUDE_DIR})
+ENDMACRO (EXTERNAL_JPEG_LIBRARY)
+
+#-------------------------------------------------------------------------------
+MACRO (PACKAGE_JPEG_LIBRARY compress_type)
+  ADD_CUSTOM_TARGET (JPEG-GenHeader-Copy ALL
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${JPEG_INCLUDE_DIR_GEN}/jconfig.h ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/
+      COMMENT "Copying ${JPEG_INCLUDE_DIR_GEN}/jconfig.h to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/"
+  )
+  SET (EXTERNAL_HEADER_LIST ${EXTERNAL_HEADER_LIST} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/jconfig.h)
+  ADD_CUSTOM_TARGET (JPEG-Library-Copy ALL
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${JPEG_LIBRARY} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/
+      COMMENT "Copying ${JPEG_LIBRARY} to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/"
+  )
+  GET_FILENAME_COMPONENT(JPEG_LIB_NAME ${JPEG_LIBRARY} NAME)
+  SET (EXTERNAL_LIBRARY_LIST ${EXTERNAL_LIBRARY_LIST} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${JPEG_LIB_NAME})
+  IF (${compress_type} MATCHES "SVN" OR ${compress_type} MATCHES "TGZ")
+    ADD_DEPENDENCIES (JPEG-GenHeader-Copy JPEG)
+    ADD_DEPENDENCIES (JPEG-Library-Copy JPEG)
+  ENDIF (${compress_type} MATCHES "SVN" OR ${compress_type} MATCHES "TGZ")
+ENDMACRO (PACKAGE_JPEG_LIBRARY)
+
+#-------------------------------------------------------------------------------
+MACRO (EXTERNAL_SZIP_LIBRARY compress_type libtype encoding)
+  IF (${compress_type} MATCHES "SVN")
+    EXTERNALPROJECT_ADD (SZIP
+        SVN_REPOSITORY ${SZIP_URL}
+        # [SVN_REVISION rev] 
+        INSTALL_COMMAND ""
+        CMAKE_ARGS
+            -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
+            -DSZIP_ENABLE_ENCODING:BOOL=${encoding}
+    ) 
+  ELSEIF (${compress_type} MATCHES "TGZ")
+    EXTERNALPROJECT_ADD (SZIP
+        URL ${SZIP_URL}
+        URL_MD5 ""
+        INSTALL_COMMAND ""
+        CMAKE_ARGS
+            -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
+            -DSZIP_ENABLE_ENCODING:BOOL=${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${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${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${DBG_EXT}${CMAKE_STATIC_LIBRARY_SUFFIX}")
+  ENDIF (${libtype} MATCHES "SHARED")
+  SET (SZIP_INCLUDE_DIR_GEN "${BINARY_DIR}")
+  SET (SZIP_INCLUDE_DIR "${SOURCE_DIR}/src")
+  SET (SZIP_FOUND 1)
+  SET (SZIP_LIBRARIES ${SZIP_LIBRARY})
+  SET (SZIP_INCLUDE_DIRS ${SZIP_INCLUDE_DIR_GEN} ${SZIP_INCLUDE_DIR})
+ENDMACRO (EXTERNAL_SZIP_LIBRARY)
+
+#-------------------------------------------------------------------------------
+MACRO (PACKAGE_SZIP_LIBRARY compress_type libtype)
+  ADD_CUSTOM_TARGET (SZIP-GenHeader-Copy ALL
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SZIP_INCLUDE_DIR_GEN}/SZconfig.h ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/
+      COMMENT "Copying ${SZIP_INCLUDE_DIR_GEN}/SZconfig.h to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/"
+  )
+  SET (EXTERNAL_HEADER_LIST ${EXTERNAL_HEADER_LIST} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/SZconfig.h)
+  ADD_CUSTOM_TARGET (SZIP-Library-Copy ALL
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SZIP_LIBRARY} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/
+      COMMENT "Copying ${SZIP_LIBRARY} to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/"
+  )
+  GET_FILENAME_COMPONENT(SZIP_LIB_NAME ${SZIP_LIBRARY} NAME)
+  SET (EXTERNAL_LIBRARY_LIST ${EXTERNAL_LIBRARY_LIST} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${SZIP_LIB_NAME})
+  IF (${compress_type} MATCHES "SVN" OR ${compress_type} MATCHES "TGZ")
+    ADD_DEPENDENCIES (SZIP-GenHeader-Copy SZIP)
+    ADD_DEPENDENCIES (SZIP-Library-Copy SZIP)
+  ENDIF (${compress_type} MATCHES "SVN" OR ${compress_type} MATCHES "TGZ")
+  IF (WIN32 AND NOT CYGWIN)
+    IF (${libtype} MATCHES "SHARED")
+      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}")
+      SET (EXTERNAL_LIBRARYDLL_LIST ${EXTERNAL_LIBRARYDLL_LIST} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${SZIP_DLL_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
+      ADD_CUSTOM_TARGET (SZIP-Dll-Copy ALL
+          COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SZIP_BIN_PATH}/${SZIP_DLL_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/
+          COMMENT "Copying ${SZIP_BIN_PATH}/${SZIP_DLL_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/"
+      )
+      IF (${compress_type} MATCHES "SVN" OR ${compress_type} MATCHES "TGZ")
+        ADD_DEPENDENCIES (SZIP-Dll-Copy SZIP)
+      ENDIF (${compress_type} MATCHES "SVN" OR ${compress_type} MATCHES "TGZ")
+    ENDIF (${libtype} MATCHES "SHARED")
+  ENDIF (WIN32 AND NOT CYGWIN)
+ENDMACRO (PACKAGE_SZIP_LIBRARY)
+
+#-------------------------------------------------------------------------------
+MACRO (EXTERNAL_ZLIB_LIBRARY compress_type libtype)
+  IF (${compress_type} MATCHES "SVN")
+    EXTERNALPROJECT_ADD (ZLIB
+        SVN_REPOSITORY ${ZLIB_URL}
+        # [SVN_REVISION rev] 
+        INSTALL_COMMAND ""
+        CMAKE_ARGS
+            -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
+            -DHDF_LEGACY_NAMING:BOOL=${HDF_LEGACY_NAMING}
+    ) 
+  ELSEIF (${compress_type} MATCHES "TGZ")
+    EXTERNALPROJECT_ADD (ZLIB
+        URL ${ZLIB_URL}
+        URL_MD5 ""
+        INSTALL_COMMAND ""
+        CMAKE_ARGS
+            -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
+            -DHDF_LEGACY_NAMING:BOOL=${HDF_LEGACY_NAMING}
+    ) 
+  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${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${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${DBG_EXT}${CMAKE_STATIC_LIBRARY_SUFFIX}")
+      ELSE (HDF_LEGACY_NAMING)
+        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${DBG_EXT}${CMAKE_STATIC_LIBRARY_SUFFIX}")
+    ENDIF (WIN32 AND NOT MINGW)
+  ENDIF (${libtype} MATCHES "SHARED")
+  SET (ZLIB_INCLUDE_DIR_GEN "${BINARY_DIR}")
+  SET (ZLIB_INCLUDE_DIR "${SOURCE_DIR}/src")
+  SET (ZLIB_FOUND 1)
+  SET (ZLIB_LIBRARIES ${ZLIB_LIBRARY})
+  SET (ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR_GEN} ${ZLIB_INCLUDE_DIR})
+ENDMACRO (EXTERNAL_ZLIB_LIBRARY)
+
+#-------------------------------------------------------------------------------
+MACRO (PACKAGE_ZLIB_LIBRARY compress_type libtype)
+  ADD_CUSTOM_TARGET (ZLIB-GenHeader-Copy ALL
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${ZLIB_INCLUDE_DIR_GEN}/zconf.h ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/
+      COMMENT "Copying ${ZLIB_INCLUDE_DIR_GEN}/zconf.h to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/"
+  )
+  SET (EXTERNAL_HEADER_LIST ${EXTERNAL_HEADER_LIST} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/zconf.h)
+  ADD_CUSTOM_TARGET (ZLIB-Library-Copy ALL
+      COMMAND ${CMAKE_COMMAND} -E copy_if_different ${ZLIB_LIBRARY} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/
+      COMMENT "Copying ${ZLIB_LIBRARY} to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/"
+  )
+  GET_FILENAME_COMPONENT(ZLIB_LIB_NAME ${ZLIB_LIBRARY} NAME)
+  SET (EXTERNAL_LIBRARY_LIST ${EXTERNAL_LIBRARY_LIST} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${ZLIB_LIB_NAME})
+  IF (${compress_type} MATCHES "SVN" OR ${compress_type} MATCHES "TGZ")
+    ADD_DEPENDENCIES (ZLIB-GenHeader-Copy ZLIB)
+    ADD_DEPENDENCIES (ZLIB-Library-Copy ZLIB)
+  ENDIF (${compress_type} MATCHES "SVN" OR ${compress_type} MATCHES "TGZ")
+  IF (WIN32 AND NOT CYGWIN)
+    IF (${libtype} MATCHES "SHARED")
+      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}")
+      SET (EXTERNAL_LIBRARYDLL_LIST ${EXTERNAL_LIBRARYDLL_LIST} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${ZLIB_DLL_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
+      ADD_CUSTOM_TARGET (ZLIB-Dll-Copy ALL
+          COMMAND ${CMAKE_COMMAND} -E copy_if_different ${ZLIB_BIN_PATH}/${ZLIB_DLL_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/
+          COMMENT "Copying ${ZLIB_BIN_PATH}/${ZLIB_DLL_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX} to ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/"
+      )
+      IF (${compress_type} MATCHES "SVN" OR ${compress_type} MATCHES "TGZ")
+        ADD_DEPENDENCIES (ZLIB-Dll-Copy ZLIB)
+      ENDIF (${compress_type} MATCHES "SVN" OR ${compress_type} MATCHES "TGZ")
+    ENDIF (${libtype} MATCHES "SHARED")
+  ENDIF (WIN32 AND NOT CYGWIN)
+ENDMACRO (PACKAGE_ZLIB_LIBRARY)
+
+#-------------------------------------------------------------------------------
+MACRO (IDE_GENERATED_PROPERTIES SOURCE_PATH HEADERS SOURCES)
+  #set(source_group_path "Source/AIM/${NAME}")
+  STRING (REPLACE "/" "\\\\" source_group_path ${SOURCE_PATH})
+  source_group (${source_group_path} FILES ${HEADERS} ${SOURCES})
+
+  #-- The following is needed if we ever start to use OS X Frameworks but only
+  #--  works on CMake 2.6 and greater
+  #SET_PROPERTY (SOURCE ${HEADERS}
+  #       PROPERTY MACOSX_PACKAGE_LOCATION Headers/${NAME}
+  #)
+ENDMACRO (IDE_GENERATED_PROPERTIES)
+
+#-------------------------------------------------------------------------------
+MACRO (IDE_SOURCE_PROPERTIES SOURCE_PATH HEADERS SOURCES)
+  #  INSTALL (FILES ${HEADERS}
+  #       DESTINATION include/R3D/${NAME}
+  #       COMPONENT Headers       
+  #  )
+
+  STRING (REPLACE "/" "\\\\" source_group_path ${SOURCE_PATH}  )
+  source_group (${source_group_path} FILES ${HEADERS} ${SOURCES})
+
+  #-- The following is needed if we ever start to use OS X Frameworks but only
+  #--  works on CMake 2.6 and greater
+  #SET_PROPERTY (SOURCE ${HEADERS}
+  #       PROPERTY MACOSX_PACKAGE_LOCATION Headers/${NAME}
+  #)
+ENDMACRO (IDE_SOURCE_PROPERTIES)
+
+#-------------------------------------------------------------------------------
+MACRO (TARGET_NAMING target libtype)
+  IF (WIN32 AND NOT MINGW)
+    IF (${libtype} MATCHES "SHARED")
+      IF (HDF_LEGACY_NAMING)
+        SET_TARGET_PROPERTIES (${target} PROPERTIES OUTPUT_NAME "dll")
+        SET_TARGET_PROPERTIES (${target} PROPERTIES PREFIX "${target}")
+      ELSE (HDF_LEGACY_NAMING)
+        SET_TARGET_PROPERTIES (${target} PROPERTIES OUTPUT_NAME "${target}dll")
+      ENDIF (HDF_LEGACY_NAMING)
+    ENDIF (${libtype} MATCHES "SHARED")
+  ENDIF (WIN32 AND NOT MINGW)
+ENDMACRO (TARGET_NAMING)
+
+#-------------------------------------------------------------------------------
+MACRO (HDF_SET_LIB_OPTIONS libtarget libname libtype)
+  # message (STATUS "${libname} libtype: ${libtype}")
+  IF (${libtype} MATCHES "SHARED")
+    IF (WIN32 AND NOT MINGW)
+      IF (HDF_LEGACY_NAMING)
+        SET (LIB_RELEASE_NAME "${libname}dll")
+        SET (LIB_DEBUG_NAME "${libname}ddll")
+      ELSE (HDF_LEGACY_NAMING)
+        SET (LIB_RELEASE_NAME "${libname}")
+        SET (LIB_DEBUG_NAME "${libname}_D")
+      ENDIF (HDF_LEGACY_NAMING)
+    ELSE (WIN32 AND NOT MINGW)
+      SET (LIB_RELEASE_NAME "${libname}")
+      SET (LIB_DEBUG_NAME "${libname}_debug")
+    ENDIF (WIN32 AND NOT MINGW)
+  ELSE (${libtype} MATCHES "SHARED")
+    IF (WIN32 AND NOT MINGW)
+      IF (HDF_LEGACY_NAMING)
+        SET (LIB_RELEASE_NAME "${libname}")
+        SET (LIB_DEBUG_NAME "${libname}d")
+      ELSE (HDF_LEGACY_NAMING)
+        SET (LIB_RELEASE_NAME "lib${libname}")
+        SET (LIB_DEBUG_NAME "lib${libname}_D")
+      ENDIF (HDF_LEGACY_NAMING)
+    ELSE (WIN32 AND NOT MINGW)
+      # if the generator supports configuration types or if the CMAKE_BUILD_TYPE has a value
+      IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+        SET (LIB_RELEASE_NAME "${libname}")
+        SET (LIB_DEBUG_NAME "${libname}_debug")
+      ELSE (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+        SET (LIB_RELEASE_NAME "lib${libname}")
+        SET (LIB_DEBUG_NAME "lib${libname}_debug")
+      ENDIF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
+    ENDIF (WIN32 AND NOT MINGW)
+  ENDIF (${libtype} MATCHES "SHARED")
+  
+  SET_TARGET_PROPERTIES (${libtarget}
+      PROPERTIES
+      DEBUG_OUTPUT_NAME          ${LIB_DEBUG_NAME}
+      RELEASE_OUTPUT_NAME        ${LIB_RELEASE_NAME}
+      MINSIZEREL_OUTPUT_NAME     ${LIB_RELEASE_NAME}
+      RELWITHDEBINFO_OUTPUT_NAME ${LIB_RELEASE_NAME}
+  )
+  
+  #----- Use MSVC Naming conventions for Shared Libraries
+  IF (MINGW AND ${libtype} MATCHES "SHARED")
+    SET_TARGET_PROPERTIES (${libtarget}
+        PROPERTIES
+        IMPORT_SUFFIX ".lib"
+        IMPORT_PREFIX ""
+        PREFIX ""
+    )
+  ENDIF (MINGW AND ${libtype} MATCHES "SHARED")
+
+ENDMACRO (HDF_SET_LIB_OPTIONS)
+
+#-------------------------------------------------------------------------------
+MACRO (TARGET_FORTRAN_WIN_PROPERTIES target addlinkflags)
+  IF (WIN32)
+    IF (MSVC)
+      SET_TARGET_PROPERTIES (${target}
+          PROPERTIES
+              COMPILE_FLAGS "/dll"
+              LINK_FLAGS "/SUBSYSTEM:CONSOLE ${addlinkflags}"
+      ) 
+    ENDIF (MSVC)
+  ENDIF (WIN32)
+ENDMACRO (TARGET_FORTRAN_WIN_PROPERTIES)
diff --git a/config/cmake/hdf5-config.cmake.install.in b/config/cmake/hdf5-config.cmake.install.in
index dadbeb6..8dcd86f 100644
--- a/config/cmake/hdf5-config.cmake.install.in
+++ b/config/cmake/hdf5-config.cmake.install.in
@@ -39,6 +39,7 @@ ENDIF (HDF5_BUILD_HL_LIB AND HDF5_BUILD_CPP_LIB)
 

 IF (HDF5_BUILD_TOOLS)

   SET (HDF5_INCLUDE_DIR_TOOLS "@CMAKE_INSTALL_PREFIX@/include/tools" )

+  SET (HDF5_TOOLS_DIR "@CMAKE_INSTALL_PREFIX@/bin/tools" )

 ENDIF (HDF5_BUILD_TOOLS)

 

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

diff --git a/config/cmake/runTest.cmake b/config/cmake/runTest.cmake
index 26acc39..34fac1f 100644
--- a/config/cmake/runTest.cmake
+++ b/config/cmake/runTest.cmake
@@ -14,15 +14,15 @@ ENDIF (NOT TEST_FOLDER)
 IF (NOT TEST_OUTPUT)
   MESSAGE (FATAL_ERROR "Require TEST_OUTPUT to be defined")
 ENDIF (NOT TEST_OUTPUT)
-#IF (NOT TEST_EXPECT)
-#  MESSAGE (STATUS "Require TEST_EXPECT to be defined")
-#ENDIF (NOT TEST_EXPECT)
+IF (NOT TEST_EXPECT)
+  MESSAGE (STATUS "Require TEST_EXPECT to be defined")
+ENDIF (NOT TEST_EXPECT)
 #IF (NOT TEST_FILTER)
 #  MESSAGE (STATUS "Require TEST_FILTER to be defined")
 #ENDIF (NOT TEST_FILTER)
-IF (NOT TEST_REFERENCE)
+IF (NOT TEST_SKIP_COMPARE AND NOT TEST_REFERENCE)
   MESSAGE (FATAL_ERROR "Require TEST_REFERENCE to be defined")
-ENDIF (NOT TEST_REFERENCE)
+ENDIF (NOT TEST_SKIP_COMPARE AND NOT TEST_REFERENCE)
 
 SET (ERROR_APPEND 1)
 
@@ -77,7 +77,7 @@ IF (TEST_MASK_ERROR)
   FILE (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM)
   STRING(REGEX REPLACE "thread [0-9]*:" "thread (IDs):" TEST_STREAM "${TEST_STREAM}") 
   STRING(REGEX REPLACE ": ([^\n]*)[.]c " ": (file name) " TEST_STREAM "${TEST_STREAM}") 
-  STRING(REGEX REPLACE "line [0-9]*" "line (number)" TEST_STREAM "${TEST_STREAM}") 
+  STRING(REGEX REPLACE " line [0-9]*" " line (number)" TEST_STREAM "${TEST_STREAM}") 
   STRING(REGEX REPLACE "v[1-9]*[.][0-9]*[.]" "version (number)." TEST_STREAM "${TEST_STREAM}") 
   STRING(REGEX REPLACE "[1-9]*[.][0-9]*[.][0-9]*[^)]*" "version (number)" TEST_STREAM "${TEST_STREAM}") 
   STRING(REGEX REPLACE "H5Eget_auto[1-2]*" "H5Eget_auto(1 or 2)" TEST_STREAM "${TEST_STREAM}") 
@@ -91,23 +91,25 @@ IF (TEST_FILTER)
   FILE (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}")
 ENDIF (TEST_FILTER)
 
-IF (WIN32 AND NOT MINGW)
-  FILE (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
-  FILE (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
-ENDIF (WIN32 AND NOT MINGW)
-
-# now compare the output with the reference
-EXECUTE_PROCESS (
-    COMMAND ${CMAKE_COMMAND} -E compare_files ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_FOLDER}/${TEST_REFERENCE}
-    RESULT_VARIABLE TEST_RESULT
-)
-
-MESSAGE (STATUS "COMPARE Result: ${TEST_RESULT}")
-
-# again, if return value is !=0 scream and shout
-IF (NOT ${TEST_RESULT} STREQUAL 0)
-  MESSAGE (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did not match ${TEST_REFERENCE}")
-ENDIF (NOT ${TEST_RESULT} STREQUAL 0)
+IF (NOT TEST_SKIP_COMPARE)
+  IF (WIN32 AND NOT MINGW)
+    FILE (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM)
+    FILE (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}")
+  ENDIF (WIN32 AND NOT MINGW)
+
+  # now compare the output with the reference
+  EXECUTE_PROCESS (
+      COMMAND ${CMAKE_COMMAND} -E compare_files ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_FOLDER}/${TEST_REFERENCE}
+      RESULT_VARIABLE TEST_RESULT
+  )
+
+  MESSAGE (STATUS "COMPARE Result: ${TEST_RESULT}")
+
+  # again, if return value is !=0 scream and shout
+  IF (NOT ${TEST_RESULT} STREQUAL 0)
+    MESSAGE (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did not match ${TEST_REFERENCE}")
+  ENDIF (NOT ${TEST_RESULT} STREQUAL 0)
+ENDIF (NOT TEST_SKIP_COMPARE)
 
 # everything went fine...
 MESSAGE ("Passed: The output of ${TEST_PROGRAM} matches ${TEST_REFERENCE}")