From 827170c31f1ed0dc10b75e4cf6eca2bd2005ef1e Mon Sep 17 00:00:00 2001 From: Raymond Lu Date: Thu, 16 Jul 2009 11:13:55 -0500 Subject: [svn-r17193] Update and enable h5copy test. Not tested yet. --- vms/build.com | 9 +++++-- vms/tools/h5copy/check_h5copy.com | 50 ++++++++++++++++++++++++++++++++------- 2 files changed, 48 insertions(+), 11 deletions(-) diff --git a/vms/build.com b/vms/build.com index ee13379..af5cc6d 100644 --- a/vms/build.com +++ b/vms/build.com @@ -27,7 +27,8 @@ $ hdf5cxxtest = tmp + ".C__.TEST]" $ hdf5toolstest = tmp + ".TOOLS.TESTFILES]" $ hdf5toolstest_h5diff = tmp + ".TOOLS.H5DIFF.TESTFILES]" $ hdf5toolstest_h5repack = tmp + ".TOOLS.H5REPACK.TESTFILES]" -$ h5importtest = tmp + ".TOOLS.H5IMPORT.TESTFILES]" +$ hdf5toolstest_h5copy = tmp + ".TOOLS.H5COPY.TESTFILES]" +$ hdf5toolstest_h5import = tmp + ".TOOLS.H5IMPORT.TESTFILES]" $ set def 'hdf5vms' $@make $ set def 'hdf5ctest' @@ -48,7 +49,11 @@ $ set def 'hdf5toolstest_h5repack' $ copy [-]check_h5repack.com check_h5repack.com $@check_h5repack.com $! -$ set def 'h5importtest' +$ set def 'hdf5toolstest_h5copy' +$ copy [-]check_h5copy.com check_h5copy.com +$@check_h5copy.com +$! +$ set def 'hdf5toolstest_h5import' $ copy [.-]check_h5import.com check_h5import.com $@check_h5import.com $ diff --git a/vms/tools/h5copy/check_h5copy.com b/vms/tools/h5copy/check_h5copy.com index bb769df..e73dd56 100644 --- a/vms/tools/h5copy/check_h5copy.com +++ b/vms/tools/h5copy/check_h5copy.com @@ -15,15 +15,15 @@ $!# $! $ ! $ ! This command file tests h5copy utility. The command file has to -$ ! run in the [hdf5-top.tools.testfiles] directory. +$ ! run in the [hdf5-top.tools.h5copy.testfiles] directory. $ ! $ ! $ ! Define h5copy symbols $ ! $ current_dir = F$DIRECTRY() $ len = F$LENGTH(current_dir) -$ temp = F$EXTRACT(0, len-10, current_dir) -$ h5copy_dir = temp + "H5COPY]" +$ temp = F$EXTRACT(0, len-11, current_dir) +$ h5copy_dir = temp + "]" $ h5copy :== $sys$disk:'h5copy_dir'h5copy.exe $ ! $ ! @@ -32,10 +32,45 @@ $ ! $ $ !# copy files -$ CALL TOOLTEST "test1.h5/array test1_out.h5/array" -$ CALL TOOLTEST "test1.h5/integer test1_out.h5/integer_copy" -$ CALL TOOLTEST "test1.h5/g1 test1_out.h5/g1" +$ write sys$output "Test copying various forms of datasets" +$ CALL TOOLTEST "-i h5copytst.h5 -o out.h5 -v -s simple -d simple" +$ CALL TOOLTEST "-i h5copytst.h5 -o out.h5 -v -s chunk -d chunk" +$ CALL TOOLTEST "-i h5copytst.h5 -o out.h5 -v -s compact -d compact" +$ CALL TOOLTEST "-i h5copytst.h5 -o out.h5 -v -s compound -d compound" +$ CALL TOOLTEST "-i h5copytst.h5 -o out.h5 -v -s compressed -d compressed" +$ CALL TOOLTEST "-i h5copytst.h5 -o out.h5 -v -s named_vl -d named_vl" +$ CALL TOOLTEST "-i h5copytst.h5 -o out.h5 -v -s nested_vl -d nested_vl" $ ! +$ write sys$output " " +$ write sys$output "Test copying dataset within group in source file to root of destination" +$ CALL TOOLTEST "-i h5copytst.h5 -o out.h5 -v -s grp_dsets/simple -d simple_top" +$ write sys$output " " +$ write sys$output "Test copying & renaming dataset" +$ CALL TOOLTEST "-i h5copytst.h5 -o out.h5 -v -s compound -d rename" +$! +$ write sys$output " " +$ write sys$output "Test copying empty, 'full' & 'nested' groups" +$ CALL TOOLTEST "-i h5copytst.h5 -o out.h5 -v -s grp_empty -d grp_empty" +$ CALL TOOLTEST "-i h5copytst.h5 -o out.h5 -v -s grp_dsets -d grp_dsets" +$ CALL TOOLTEST "-i h5copytst.h5 -o out.h5 -v -s grp_nested -d grp_nested" +$! +$ write sys$output " " +$ write sys$output "Test copying dataset within group in source file to group in destination" +$ CALL TOOLTEST "-i h5copytst.h5 -o out.h5 -v -s /grp_dsets/simple -d /grp_dsets/simple_group" +$! write sys$output "Test copying & renaming group" +$! CALL TOOLTEST_FAIL "-i h5copytst.h5 -o out.h5 -v -s grp_dsets -d grp_rename +$! write sys$output "Test copying full group hierarchy into group in destination file" +$! CALL TOOLTEST_FAIL "-i h5copytst.h5 -o out.h5 -v -s grp_dsets -d /grp_rename/grp_dsets" +$! +$ write sys$output " " +$ write sys$output "Test copying objects into group hier. that doesn't exist yet in destination file" +$ CALL TOOLTEST "-i h5copytst.h5 -o out.h5 -vp -s simple -d /A/B1/simple" +$ CALL TOOLTEST "-i h5copytst.h5 -o out.h5 -vp -s simple -d /A/B2/simple2" +$ CALL TOOLTEST "-i h5copytst.h5 -o out.h5 -vp -s /grp_dsets/simple -d /C/D/simple" +$!CALL TOOLTEST_FAIL "-i h5copytst.h5 -o out.h5 -vp -s /grp_dsets -d /E/F/grp_dsets" +$!CALL TOOLTEST_FAIL "-i h5copytst.h5 -o out.h5 -vp -s /grp_nested -d /G/H/grp_nested" +$! +$ del *out.h5;* $ ! $TOOLTEST: SUBROUTINE @@ -65,8 +100,5 @@ $ del *.err;* $ endif $ ! $ write sys$output line -$ ! -$ del *out.h5;* $ ! $ENDSUBROUTINE - -- cgit v0.12