From 1f670acd6e059c3ed1cac1f0aee7d84b8f3ebf7e Mon Sep 17 00:00:00 2001 From: Raymond Lu Date: Mon, 24 Jun 2013 17:21:07 -0500 Subject: [svn-r23817] I updated the make files and test script files for OpenVMS. Not tested yet. --- vms/tools/h5diff/check_h5diff.com | 40 +++++++++++++++++- vms/tools/h5dump/check_h5dump.com | 76 +++++++++++++++++++++++++++++++---- vms/tools/h5import/check_h5import.com | 21 ++++++---- vms/tools/h5jam/check_h5jam.com | 19 +++++++++ vms/tools/h5ls/check_h5ls.com | 6 +++ vms/tools/h5repack/check_h5repack.com | 76 ++++++++++++++++++++++++++++++++++- vms/tools/lib/make.com | 2 +- 7 files changed, 219 insertions(+), 21 deletions(-) diff --git a/vms/tools/h5diff/check_h5diff.com b/vms/tools/h5diff/check_h5diff.com index 296a876..e5a7b07 100644 --- a/vms/tools/h5diff/check_h5diff.com +++ b/vms/tools/h5diff/check_h5diff.com @@ -154,6 +154,9 @@ $! $!# 5.8 (region reference) $ CALL TOOLTEST h5diff_58.txt "-v h5diff_dset1.h5 h5diff_dset2.h5 refreg" $! +$!# 5.9 (test for both dset and attr with same type but with different size" +$ CALL TOOLTEST h5diff_59.txt "-v h5diff_dtypes.h5 h5diff_dtypes.h5 dset11a dset11b" +$! $!# ############################################################################## $!# # Error messages $!# ############################################################################## @@ -357,6 +360,12 @@ $!# entire file $!# All the comparables should display differences. $ CALL TOOLTEST h5diff_222.txt "-c non_comparables1.h5 non_comparables2.h5" $! +#!# non-comparable test for common objects (same name) with different object types +$ CALL TOOLTEST h5diff_223.txt "-c non_comparables1.h5 non_comparables2.h5 /diffobjtypes" +$! +#!# swap files +$ CALL TOOLTEST h5diff_224.txt "-c non_comparables2.h5 non_comparables1.h5 /diffobjtypes" +$! $!# ############################################################################## $!# # Links compare without --follow-symlinks nor --no-dangling-links $!# ############################################################################## @@ -461,6 +470,26 @@ $ CALL TOOLTEST h5diff_458.txt "--follow-symlinks -v --no-dangling-links h5dif $!# dangling link found for ext links (obj to obj). Both dangle links $ CALL TOOLTEST h5diff_459.txt "--follow-symlinks -v --no-dangling-links h5diff_extlink_src.h5 h5diff_extlink_src.h5 /ext_link_noexist1 /ext_link_noexist2" $! +#!# dangling link --follow-symlinks (obj vs obj) +$ CALL TOOLTEST h5diff_465.txt "--follow-symlinks h5diff_danglelinks1.h5 h5diff_danglelinks2.h5 /soft_link1" +#!# soft dangling vs. soft dangling +$ CALL TOOLTEST h5diff_466.txt "--follow-symlinks -v h5diff_danglelinks1.h5 h5diff_danglelinks2.h5 /soft_link1" +#!# soft link vs. soft dangling +$ CALL TOOLTEST h5diff_467.txt "--follow-symlinks -v h5diff_danglelinks1.h5 h5diff_danglelinks2.h5 /soft_link2" +#!# ext dangling vs. ext dangling +$ CALL TOOLTEST h5diff_468.txt "--follow-symlinks -v h5diff_danglelinks1.h5 h5diff_danglelinks2.h5 /ext_link4" +#!# ext link vs. ext dangling +$ CALL TOOLTEST h5diff_469.txt "--follow-symlinks -v h5diff_danglelinks1.h5 h5diff_danglelinks2.h5 /ext_link2" +$! +#!# dangling links without follow symlink +#!# test - soft dangle links (same and different paths), +#!# - external dangle links (same and different paths) +$ CALL TOOLTEST h5diff_471.txt "-v h5diff_danglelinks1.h5 h5diff_danglelinks2.h5" +$ CALL TOOLTEST h5diff_472.txt "-v h5diff_danglelinks1.h5 h5diff_danglelinks2.h5 /soft_link1" +$ CALL TOOLTEST h5diff_473.txt "-v h5diff_danglelinks1.h5 h5diff_danglelinks2.h5 /soft_link4" +$ CALL TOOLTEST h5diff_474.txt "-v h5diff_danglelinks1.h5 h5diff_danglelinks2.h5 /ext_link4" +$ CALL TOOLTEST h5diff_475.txt "-v h5diff_danglelinks1.h5 h5diff_danglelinks2.h5 /ext_link1" + $!# ############################################################################## $!# # test for group diff recursivly $!# ############################################################################## @@ -486,7 +515,8 @@ $ CALL TOOLTEST h5diff_507.txt "-v h5diff_grp_recurse1.h5 h5diff_grp_recurse2.h5 $ CALL TOOLTEST h5diff_508.txt "-v --follow-symlinks h5diff_grp_recurse1.h5 h5diff_grp_recurse2.h5 /grp1 /elink_grp1" $!# soft-link vs ext-link -$ CALL TOOLTEST h5diff_509.txt "-v h5diff_grp_recurse1.h5 h5diff_grp_recurse2.h5 /slink_grp1 /elink_grp1TOOLTEST h5diff_510.txt -v --follow-symlinks h5diff_grp_recurse1.h5 h5diff_grp_recurse2.h5 /slink_grp1 /elink_grp1" +$ CALL TOOLTEST h5diff_509.txt "-v h5diff_grp_recurse1.h5 h5diff_grp_recurse2.h5 /slink_grp1 /elink_grp1" +$ CALL TOOLTEST h5diff_510.txt "-v --follow-symlinks h5diff_grp_recurse1.h5 h5diff_grp_recurse2.h5 /slink_grp1 /elink_grp1" $!# circled ext links $ CALL TOOLTEST h5diff_511.txt "-v h5diff_grp_recurse1.h5 h5diff_grp_recurse2.h5 /grp10 /grp11" @@ -522,13 +552,19 @@ $ CALL TOOLTEST h5diff_481.txt "-v h5diff_exclude1-1.h5 h5diff_exclude1-2.h5" $!# $!# Different structure, different names. $!# -$!# Exclude all the different objects. Expect return - sameTOOLTEST h5diff_482.txt -v --exclude-path "/group1" --exclude-path "/dset1" h5diff_exclude2-1.h5 h5diff_exclude2-2.h5 +$!# Exclude all the different objects. Expect return - same +TOOLTEST h5diff_482.txt "-v --exclude-path "/group1" --exclude-path "/dset1" h5diff_exclude2-1.h5 h5diff_exclude2-2.h5" $!# Exclude only some different objects. Expect return - diff $ CALL TOOLTEST h5diff_483.txt "-v --exclude-path "/group1" h5diff_exclude2-1.h5 h5diff_exclude2-2.h5" $!# Exclude from group compare $ CALL TOOLTEST h5diff_484.txt "-v --exclude-path "/dset3" h5diff_exclude1-1.h5 h5diff_exclude1-2.h5 /group1" +$!# Only one file contains unique objs. Common objs are same. +$ CALL TOOLTEST h5diff_485.txt "-v --exclude-path "/group1" h5diff_exclude3-1.h5 h5diff_exclude3-2.h5" +$ CALL TOOLTEST h5diff_486.txt "-v --exclude-path "/group1" h5diff_exclude3-2.h5 h5diff_exclude3-1.h5" +$ CALL TOOLTEST h5diff_487.txt "-v --exclude-path "/group1/dset" h5diff_exclude3-1.h5 h5diff_exclude3-2.h5" + $!# ############################################################################## $!# # diff various multiple vlen and fixed strings in a compound type dataset $!# ############################################################################## diff --git a/vms/tools/h5dump/check_h5dump.com b/vms/tools/h5dump/check_h5dump.com index e6c81ee..6ee5dec 100644 --- a/vms/tools/h5dump/check_h5dump.com +++ b/vms/tools/h5dump/check_h5dump.com @@ -36,19 +36,46 @@ $ ! $ ! h5dump tests $ ! $ +$ ! Test data output redirection +$ CALL TOOLTEST tnoddl.ddl "--ddl -y packedbits.h5" +$ CALL TOOLTEST tnodata.ddl "--output packedbits.h5" +$ CALL TOOLTEST tnoattrddl.ddl "-"""O""" -y tattr.h5" +$ CALL TOOLTEST tnoattrdata.ddl "-"""A""" -o tattr.h5" +$ CALL TOOLTEST2 trawdatafile.exp "-y -o trawdatafile.txt packedbits.h5" +$ CALL TOOLTEST2 tnoddlfile.exp "-"""O""" -y -o tnoddlfile.txt packedbits.h5" +$ CALL TOOLTEST2A twithddlfile.exp twithddl.exp "--ddl=twithddl.txt -y -o twithddlfile.txt packedbits.h5" +$ CALL TOOLTEST2 trawssetfile.exp "-d "/dset1[1,1;;;]" -y -o trawssetfile.txt tdset.h5" +$ +$ ! Test for maximum display datasets +$ CALL TOOLTEST twidedisplay.ddl "-w0 packedbits.h5" $ $ ! Test for signed/unsigned datasets $ CALL TOOLTEST packedbits.ddl "packedbits.h5" +$ ! Test for compound signed/unsigned datasets +$ CALL TOOLTEST tcmpdintsize.ddl "tcmpdintsize.h5" +$ ! Test for signed/unsigned scalar datasets +$ CALL TOOLTEST tscalarintsize.ddl "tscalarintsize.h5" +$ ! Test for signed/unsigned attributes +$ CALL TOOLTEST tattrintsize.ddl "tattrintsize.h5" +$ ! Test for compound signed/unsigned attributes +$ CALL TOOLTEST tcmpdattrintsize.ddl "tcmpdattrintsize.h5" +$ ! Test for signed/unsigned scalar attributes +$ CALL TOOLTEST tscalarattrintsize.ddl "tscalarattrintsize.h5" +$ ! Test for string scalar dataset attribute +$ CALL TOOLTEST tscalarstring.ddl "tscalarstring.h5" +$ $ ! Test for displaying groups $ CALL TOOLTEST tgroup-1.ddl "tgroup.h5" $ ! Test for displaying the selected groups $ ! Commented out due to the difference of printing format. $ ! CALL TOOLTEST tgroup-2.ddl "--group=/g2 --group / -g /y tgroup.h5" +$ $ ! Test for displaying simple space datasets $ CALL TOOLTEST tdset-1.ddl "tdset.h5" $ ! Test for displaying selected datasets $ ! Commented out due to the difference of printing format. $ ! CALL TOOLTEST tdset-2.ddl "-"""H""" -d dset1 -d /dset2 --dataset=dset3 tdset.h5" +$ $ ! Test for displaying attributes $ CALL TOOLTEST tattr-1.ddl "tattr.h5" $ ! Test for displaying the selected attributes of string type and scalar space @@ -56,15 +83,19 @@ $ CALL TOOLTEST tattr-2.ddl "-a /attr1 --attribute /attr4 --attribute=/attr5 tat $ ! Test for header and error messages $ ! Commented out due to the difference of printing format. $ ! CALL TOOLTEST tattr-3.ddl "--header -a /attr2 --attribute=/attr tattr.h5" +$ ! Test for displaying at least 9 attributes on root from a BE machine +$ CALL TOOLTEST tattr-4_be.ddl "tattr4_be.h5" $ ! Test for displaying attributes in shared datatype (also in group and dataset) $ CALL TOOLTEST tnamed_dtype_attr.ddl "tnamed_dtype_attr.h5" $ -$ ! Test for displaying soft links +$ ! Test for displaying soft links and user-defined links $ CALL TOOLTEST tslink-1.ddl "tslink.h5" $ CALL TOOLTEST tudlink-1.ddl "tudlink.h5" $ ! Test for displaying the selected link $ CALL TOOLTEST tslink-2.ddl "-l slink2 tslink.h5" $ CALL TOOLTEST tudlink-2.ddl "-l udlink2 tudlink.h5" +$ ! Test for displaying dangling soft links +$ CALL TOOLTEST tslink-D.ddl "-d /slink1 tslink.h5" $ $ ! Tests for hard links $ CALL TOOLTEST thlink-1.ddl "thlink.h5" @@ -84,6 +115,7 @@ $ CALL TOOLTEST tcomp-4.ddl "tcompound_complex.h5" $ $ ! Test for the nested compound type $ CALL TOOLTEST tnestcomp-1.ddl "tnestedcomp.h5" +$ CALL TOOLTEST tnestedcmpddt.ddl "tnestedcmpddt.h5" $ $ ! test for options $ CALL TOOLTEST tall-1.ddl "tall.h5" @@ -151,9 +183,8 @@ $ $ ! Test printing characters in ASCII instead of decimal $ CALL TOOLTEST tchar1.ddl "-r tchar.h5" $ -$ ! Test failure handling -$ ! Missing file name -$ CALL TOOLTEST "tnofilename.ddl" +$ ! Test datatypes in ASCII and UTF8 +$ CALL TOOLTEST charsets.ddl "charsets.h5" $ $ ! rev. 2004 $ @@ -166,6 +197,10 @@ $ CALL TOOLTEST tperror.ddl "-p -d bogus tfcontents1.h5" $ $ ! Test for file contents $ CALL TOOLTEST tcontents.ddl "-n tfcontents1.h5" +$ CALL TOOLTEST tordercontents1.ddl "-n --sort_by=name --sort_order=ascending tfcontents1.h5' +$ CALL TOOLTEST tordercontents2.ddl "-n --sort_by=name --sort_order=descending tfcontents1.h5" +$ CALL TOOLTEST tattrcontents1.ddl "-n 1 --sort_order=ascending tall.h5" +$ CALL TOOLTEST tattrcontents2.ddl "-n 1 --sort_order=descending tall.h5" $ $ ! Tests for storage layout $ ! Compact @@ -209,8 +244,24 @@ $ CALL TOOLTEST texceedsubcount.ddl "-d 1d -c 1,3 taindices.h5" $ CALL TOOLTEST texceedsubstride.ddl "-d 1d -"""S""" 1,3 taindices.h5" $ CALL TOOLTEST texceedsubblock.ddl "-d 1d -k 1,3 taindices.h5" +$ ! Tests for filters +$ ! SZIP +$ CALL TOOLTEST tszip.ddl "-"""H""" -p -d szip tfilters.h5" +$ ! deflate +$ CALL TOOLTEST tdeflate.ddl "-"""H""" -p -d deflate tfilters.h5" +$ ! shuffle +$ CALL TOOLTEST tshuffle.ddl "-"""H""" -p -d shuffle tfilters.h5" +$ ! fletcher32 +$ CALL TOOLTEST tfletcher32.ddl "-"""H""" -p -d fletcher32 tfilters.h5" +$ ! nbit +$ CALL TOOLTEST tnbit.ddl "-"""H""" -p -d nbit tfilters.h5" +$ ! scaleoffset +$ CALL TOOLTEST tscaleoffset.ddl "-"""H""" -p -d scaleoffset tfilters.h5" +$ ! all +$ CALL TOOLTEST tallfilters.ddl "-"""H""" -p -d all tfilters.h5" $ ! User defined -$ CALL TOOLTEST tuserfilter.ddl "-"""H""" -p -d myfilter tfilters.h5" +$ CALL TOOLTEST tuserfilter.ddl "-"""H""" -p -d myfilter tfilters.h5" + $ ! Test for displaying objects with very long names. The error message says: $ ! %DIFF-F-READERR, error reading DISK$USER:[HDFGROUP.1_8_VMS_9_30.TOOLS.TESTFILES]TLONGLINKS.DDL;1 $ ! -RMS-W-RTB, 66573 byte record too large for user's buffer @@ -233,15 +284,20 @@ $ ! Test for vms $ CALL TOOLTEST tvms.ddl "tvms.h5" $ $ !test for binary output -$ CALL TOOLTEST1 tbin1.ddl "-d integer -o out1.bin -b """LE""" tbinary.h5" -$ CALL TOOLTEST1 tbin2.ddl "-d float -o out2.bin -b """BE""" tbinary.h5" -$ CALL TOOLTEST1 tbin4.ddl "-d double -o out4.bin -b """FILE""" tbinary.h5" +$ CALL TOOLTEST tbin1.ddl "-d integer -o out1.bin -b """LE""" tbinary.h5" +$ CALL TOOLTEST tbin2.ddl "-d float -o out2.bin -b """BE""" tbinary.h5" +$ CALL TOOLTEST tbin4.ddl "-d double -o out4.bin -b """FILE""" tbinary.h5" $ +$ ! Test for string binary output +$ CALL TOOLTEST tstr2bin2.exp "-d /g2/dset2 -b -o tstr2bin2.txt tstr2.h5" +$ CALL TOOLTEST tstr2bin6.exp "-d /g6/dset6 -b -o tstr2bin6.txt tstr2.h5" + $ ! Test for dataset region references $ CALL TOOLTEST tdatareg.ddl "tdatareg.h5" $ CALL TOOLTEST tdataregR.ddl "-"""R""" tdatareg.h5" $ CALL TOOLTEST tattrreg.ddl "tattrreg.h5" $ CALL TOOLTEST tattrregR.ddl "-"""R""" tattrreg.h5" +$ CALL TOOLTEST tbinregR.exp "-d /Dataset1 -s 0 -"""R""" -y -o tbinregR.txt tdatareg.h5" $ $ ! tests for group creation order "1" tracked, "2" name, root tracked $ CALL TOOLTEST tordergr1.ddl "--group=1 --sort_by=creation_order --sort_order=ascending tordergr.h5" @@ -256,6 +312,10 @@ $ CALL TOOLTEST torderattr2.ddl "-"""H""" --sort_by=name --sort_order=descending $ CALL TOOLTEST torderattr3.ddl "-"""H""" --sort_by=creation_order --sort_order=ascending torderattr.h5" $ CALL TOOLTEST torderattr4.ddl "-"""H""" --sort_by=creation_order --sort_order=descending torderattr.h5" $ +$ ! Tests for link references and order +$ CALL TOOLTEST torderlinks1.ddl "--sort_by=name --sort_order=ascending tfcontents1.h5" +$ CALL TOOLTEST torderlinks2.ddl "--sort_by=name --sort_order=descending tfcontents1.h5" + $ ! Test for floating point user defined printf format $ CALL TOOLTEST tfpformat.ddl "-m %.7f tfpformat.h5" $ ! Test for traversal of external links diff --git a/vms/tools/h5import/check_h5import.com b/vms/tools/h5import/check_h5import.com index 88bd76a..a08751a 100644 --- a/vms/tools/h5import/check_h5import.com +++ b/vms/tools/h5import/check_h5import.com @@ -59,13 +59,14 @@ $ type sys$input $ CALL TOOLTEST "txtin16.txt -c txtin8.conf -o" txtin8.h5 $ ! $ type sys$input - Testing ASCII UI32 - rank 3 - Output BE -$ CALL TOOLTEST "txtuin32.txt -c txtuin32.conf -o" txtuin32.h5 + Testing ASCII UI16 - rank 2 - Output LE+Chunked+Compressed +$ CALL TOOLTEST "txtuin16.txt -c txtuin16.conf -o" txtuin16.h5 $ ! $ type sys$input - Testing ASCII UI16 - rank 2 - Output LE+Chunked+Compressed -$ CALL TOOLTEST "txtuin32.txt -c txtuin16.conf -o" txtuin16.h5 + Testing ASCII UI32 - rank 3 - Output BE +$ CALL TOOLTEST "txtuin32.txt -c txtuin32.conf -o" txtuin32.h5 $ ! + $ type sys$input Testing ASCII F32 - rank 3 - Output LE $ CALL TOOLTEST "txtfp32.txt -c txtfp32.conf -o" txtfp32.h5 @@ -79,14 +80,14 @@ $ type sys$input $ CALL TOOLTEST "binfp64.bin -c binfp64.conf -o" binfp64.h5 $ ! $ type sys$input - Testing BINARY I16 - rank 3 - Output order LE + CHUNKED + extended -$ CALL TOOLTEST "binin16.bin -c binin16.conf -o" binin16.h5 -$ ! -$ type sys$input Testing BINARY I8 - rank 3 - Output I16LE + Chunked+Extended+Compressed $ CALL TOOLTEST "binin8.bin -c binin8.conf -o" binin8.h5 $ ! $ type sys$input + Testing BINARY I16 - rank 3 - Output order LE + CHUNKED + extended +$ CALL TOOLTEST "binin16.bin -c binin16.conf -o" binin16.h5 +$ ! +$ type sys$input Testing BINARY I32 - rank 3 - Output BE + CHUNKED $ CALL TOOLTEST "binin32.bin -c binin32.conf -o" binin32.h5 $ ! @@ -103,6 +104,10 @@ $ type sys$input $ CALL TOOLTEST "txtstr.txt -c txtstr.conf -o" txtstr.h5 $ ! $ type sys$input + Testing BINARY I8 CR LF EOF +$ CALL TOOLTEST "binin8w.txt -c binin8w.conf -o" binin8w.h5 +$ ! +$ type sys$input Testing ASCII F64 - rank 1 - INPUT-CLASS TEXTFPE $ CALL TOOLTEST "textpfe64.txt -c textpfe.conf -o" textpfe.h5 diff --git a/vms/tools/h5jam/check_h5jam.com b/vms/tools/h5jam/check_h5jam.com index 50be903..5243ba8 100644 --- a/vms/tools/h5jam/check_h5jam.com +++ b/vms/tools/h5jam/check_h5jam.com @@ -48,7 +48,26 @@ $ CALL H5JAMTEST "-u u511.txt -i" tall.h5 ta3.h5 $ CALL H5JAMTEST "-u u512.txt -i" tall.h5 ta4.h5 $ CALL H5JAMTEST "-u u513.txt -i" tall.h5 ta5.h5 $ +$ CALL H5JAMTEST "-u u10.txt -i" twithub.h5 tax2.h5 +$ CALL H5JAMTEST "-u u511.txt -i" twithub.h5 tax3.h5 +$ CALL H5JAMTEST "-u u512.txt -i" twithub.h5 tax4.h5 +$ CALL H5JAMTEST "-u u513.txt -i" twithub.h5 tax5.h5 +$ +$ CALL H5JAMTEST "-u u10.txt -i" twithub513.h5 tax6.h5 +$ CALL H5JAMTEST "-u u511.txt -i" twithub513.h5 tax7.h5 +$ CALL H5JAMTEST "-u u512.txt -i" twithub513.h5 tax8.h5 +$ CALL H5JAMTEST "-u u513.txt -i" twithub513.h5 tax9.h5 $ +$ CALL H5JAMTEST "-u u10.txt -i --clobber" twithub.h5 taz2.h5 +$ CALL H5JAMTEST "-u u511.txt -i --clobber" twithub.h5 taz3.h5 +$ CALL H5JAMTEST "-u u512.txt -i --clobber" twithub.h5 taz4.h5 +$ CALL H5JAMTEST "-u u513.txt -i --clobber" twithub.h5 taz5.h5 +$ +$ CALL H5JAMTEST "-u u10.txt -i --clobber" twithub513.h5 taz6.h5 +$ CALL H5JAMTEST "-u u511.txt -i --clobber" twithub513.h5 taz7.h5 +$ CALL H5JAMTEST "-u u512.txt -i --clobber" twithub513.h5 taz8.h5 +$ CALL H5JAMTEST "-u u513.txt -i --clobber" twithub513.h5 taz9.h5 +$ $H5JAMTEST: SUBROUTINE $ $ len_org = F$LENGTH(P2) diff --git a/vms/tools/h5ls/check_h5ls.com b/vms/tools/h5ls/check_h5ls.com index 86fde2e..749978d 100644 --- a/vms/tools/h5ls/check_h5ls.com +++ b/vms/tools/h5ls/check_h5ls.com @@ -102,6 +102,9 @@ $ CALL TOOLTEST tsoftlinks-nodangle-1.ls "-w80 --follow-symlinks --no-dangling-l $! when used file with no dangling links - expected exit code 0 $ CALL TOOLTEST thlinks-nodangle-1.ls "-w80 --follow-symlinks --no-dangling-links thlink.h5" +$! Test for wildcards in filename +$ CALL TOOLTEST tmultifile.ls "-w80 thlink.h5 tslink.h5" + $! tests for hard links $ CALL TOOLTEST thlink-1.ls "-w80 thlink.h5" @@ -143,6 +146,9 @@ $! UNIX shell script does replacement on the fly in the actual output $! file; I do not know what can I do on VMS EIP 07/27/06 $ CALL TOOLTEST tattr2.ls "-w80 -v -"""S""" tattr2.h5" +$! test for variable length data types in verbose mode +$ CALL TOOLTEST tvldtypes2le.ls "-v tvldtypes1.h5" + $! tests for error handling. $! test for non-existing file $ CALL TOOLTEST nosuchfile.ls "nosuchfile.h5" diff --git a/vms/tools/h5repack/check_h5repack.com b/vms/tools/h5repack/check_h5repack.com index 207951e..a4c32f4 100644 --- a/vms/tools/h5repack/check_h5repack.com +++ b/vms/tools/h5repack/check_h5repack.com @@ -143,6 +143,80 @@ $ CALL TOOLTEST "-l dset_chunk:"""COMPA"""" h5repack_layout.h5 $ CALL TOOLTEST "-l dset_chunk:"""CONTI"""" h5repack_layout.h5 $ CALL TOOLTEST "-l dset_chunk:"""CHUNK"""=18x13" h5repack_layout.h5 $! +$! test convert small size dataset ( < 1k) to compact layout without -m +$ CALL TOOLTEST "-l contig_small:"""COMPA"""" h5repack_layout2.h5 +$ CALL TOOLTEST "-l chunked_small_fixed:"""COMPA"""" h5repack_layout2.h5 +$! +$! ################################################################ +$! Test file contains chunked datasets (need multiple dsets) with +$! unlimited max dims. +$! ############################################################### +$! +$! chunk to chunk - specify chunk dim bigger than any current dim +$ CALL TOOLTEST "-l chunk_unlimit1:"""CHUNK"""=100x300" h5repack_layout3.h5 +$! +$! chunk to contiguous +$ CALL TOOLTEST "-l chunk_unlimit1:"""CONTI"""" h5repack_layout3.h5 +$! +$! chunk to compact - convert big dataset (should be > 64k) for this purpose, +$! should remain as original layout (chunk) +$ CALL TOOLTEST "-l chunk_unlimit1:"""COMPA"""" h5repack_layout3.h5 +$! +$! ######################################################################### +$! Test -f for some specific cases. Chunked dataset with unlimited max dims. +$! ######################################################################### +$! +$! chunk dim is bigger than dataset dim. ( dset size < 64k ) +$ CALL TOOLTEST "-f chunk_unlimit1:"""NONE"""" h5repack_layout3.h5 +$! +$! chunk dim is bigger than dataset dim. ( dset size > 64k ) +$ CALL TOOLTEST "-f chunk_unlimit2:"""NONE"""" h5repack_layout3.h5 +$! +$! chunk dims are smaller than dataset dims. ( dset size < 64k ) +$ CALL TOOLTEST "-f chunk_unlimit3:"""NONE"""" h5repack_layout3.h5 +$! +$! file input - should not fail +$ CALL TOOLTEST "-f NONE" h5repack_layout3.h5 +$! +$! ########################################################################## +$! Test base: Convert CHUNK to CONTI for a chunked dataset with small dataset +$! (dset size < 64K) and with unlimited max dims on a condition as follow. +$! ########################################################################## +$! +$! chunk dim is bigger than dataset dim. should succeed +$ CALL TOOLTEST "-l chunk_unlimit2:"""CONTI"""" h5repack_layout3.h5 +$! +$! chunk dim is smaller than dataset dim. should succeed. +$ CALL TOOLTEST "-l chunk_unlimit3:"""CONTI"""" h5repack_layout3.h5 +$! +$! Native option. Do not use FILE1, as the named dtype will be converted to native, +$! and h5diff will report a difference. +$ CALL TOOLTEST "-n" h5repack_fill.h5 +$ CALL TOOLTEST "-n" h5repack_attr.h5 +$! +$! Check repacking file with old version of layout message (should get upgraded +$! to new version and be readable, etc.) +$ CALL TOOLTEST h5repack_layouto.h5 +$! +$! test for datum size > H5TOOLS_MALLOCSIZE +$ CALL TOOLTEST "-f GZIP=1" h5repack_objs.h5 +$! +$! Check repacking file with committed datatypes in odd configurations +$ CALL TOOLTEST h5repack_named_dtypes.h5 +$! +$! test various references (bug 1814 and 1726) +$ CALL TOOLTEST h5repack_refs.h5 +$! +$! test attribute with various references (bug1797 / HDFFV-5932) +$! the references in attribute of compund or vlen datatype +$ CALL TOOLTEST h5repack_attr_refs.h5 +$! +$! Add test for memory leak in attirbute. This test is verified by CTEST. +$! 1. leak from vlen string +$! 2. leak from compound type without reference member +$! (HDFFV-7840, ) +$! Note: this test is experimental for sharing test file among tools +$ CALL TOOLTEST h5diff_attr1.h5 $! $! $TOOLTEST: SUBROUTINE @@ -190,5 +264,3 @@ $ endif $ del *.h5repackout;* $ del *_out.h5;* $ENDSUBROUTINE - - diff --git a/vms/tools/lib/make.com b/vms/tools/lib/make.com index 8e9ff47..197b763 100644 --- a/vms/tools/lib/make.com +++ b/vms/tools/lib/make.com @@ -22,7 +22,7 @@ $! $ type sys$input Creating HDF5 Tools library $! -$ cobj="h5tools, h5tools_str, h5tools_utils, h5diff, h5diff_array, "+- +$ cobj="h5tools, h5tools_dump, h5tools_str, h5tools_utils, h5diff, h5diff_array, "+- "h5diff_attr, h5diff_dset, h5diff_util, h5trav,"+- "h5tools_filters, h5tools_ref, h5tools_type" $! -- cgit v0.12