[svn-r17210] Description:

	Bring r17157:17209 from trunk to revise_chunks branch.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
                                in debug mode
        Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x,
                                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                                w/szip filter, in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                                in production mode
        Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
        Mac OS X/32 10.5.7 (amazon) in debug mode
        Mac OS X/32 10.5.7 (amazon) w/C++ & FORTRAN, w/threadsafe,
                                in production mode

2 files changed, 67 insertions, 23 deletions

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
-
diff --git a/vms/tools/h5import/check_h5import.com b/vms/tools/h5import/check_h5import.com
index 87c854e..f25b297 100644
--- a/vms/tools/h5import/check_h5import.com
+++ b/vms/tools/h5import/check_h5import.com
@@ -48,56 +48,68 @@ $ run [.-]h5importtest
 $ !
 $ type sys$input 
                  Testing ASCII I32 rank 3 - Output BE 
-$ CALL TOOLTEST "txtin32. -c textin32. -o" test1.h5
+$ CALL TOOLTEST "txtin16.txt -c txtin32.conf -o" txtin32.h5
 $ !
 $ type sys$input 
                 Testing ASCII I16 rank 3 - Output LE - CHUNKED - extended
-$ CALL TOOLTEST  "txtin16. -c textin16. -o" test2.h5
+$ CALL TOOLTEST  "txtin16.txt -c txtin16.conf -o" txtin16.h5
 $ !
 $ type sys$input 
-                Testing ASCII I8 - rank 3 - Output I16 LE-Chunked+Extended+Compressed 
-$ CALL TOOLTEST  "txtin16. -c textin8.  -o" test3.h5
+                Testing ASCII I8 - rank 3 - Output I8 LE-Chunked+Extended+Compressed 
+$ CALL TOOLTEST  "txtin16.txt -c txtin8.conf  -o" txtin8.h5
 $ !
 $ type sys$input 
                Testing ASCII UI32 - rank 3 - Output BE 
-$ CALL TOOLTEST  "in1. -c textuin32. -o" test4.h5
+$ CALL TOOLTEST  "txtuin32.txt -c txtuin32.conf -o" txtuin32.h5
 $ !
 $ type sys$input 
                Testing ASCII UI16 - rank 2 - Output LE+Chunked+Compressed 
-$ CALL TOOLTEST  "in1. -c textuin16. -o" test5.h5
+$ CALL TOOLTEST  "txtuin32.txt -c txtuin16.conf -o" txtuin32.h5
 $ !
 $ type sys$input 
                Testing ASCII F32 - rank 3 - Output LE 
-$ CALL TOOLTEST  "fp1. -c textfp32. -o" test6.h5
+$ CALL TOOLTEST  "txtfp32.txt -c txtfp32.conf -o" txtfp32.h5
 $ !
 $ type sys$input 
                Testing ASCII F64 - rank 3 - Output BE + CHUNKED+Extended+Compressed 
-$ CALL TOOLTEST  "fp2. -c textfp64. -o" tes7.h5
+$ CALL TOOLTEST  "txtfp64.txt -c txtfp64.conf -o" txtfp64.h5
 $ !
 $ type sys$input 
                Testing BINARY F64 - rank 3 - Output LE+CHUNKED+Extended+Compressed 
-$ CALL TOOLTEST  "bfp64. -c conbfp64. -o" test8.h5
+$ 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  "bin16. -c conbin16. -o" test9.h5
+$ 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  "bin8. -c conbin8.  -o" test10.h5
+$ CALL TOOLTEST  "binin8.bin -c binin8.conf  -o" binin8.h5
 $ !
 $ type sys$input 
            
    Testing BINARY I32 - rank 3 - Output BE + CHUNKED 
-$ CALL TOOLTEST  "bin32. -c conbin32. -o" test11.h5
+$ CALL TOOLTEST  "binin32.bin -c binin32.conf -o" binin32.h5
 $ !
 $ type sys$input 
                Testing BINARY UI16 - rank 3 - Output byte BE + CHUNKED 
-$ CALL TOOLTEST  "buin16. -c conbuin16. -o" test12.h5
+$ CALL TOOLTEST  "binuin16.bin -c binuin16.conf -o" binuin16.h5
 $ !
 $ type sys$input 
                Testing BINARY UI32 - rank 3 - Output LE + CHUNKED 
-$ CALL TOOLTEST  "buin32. -c conbuin32. -o" test13.h5
+$ CALL TOOLTEST  "binuin32.bin -c binuin32.conf -o" binuin32.h5
+$ !
+$ type sys$input 
+               Testing STR 
+$ CALL TOOLTEST  "txtstr.txt -c txtstr.conf -o" txtstr.h5
+$ !
+$ type sys$input 
+               Testing BINARY I8 CR LF EOF
+$ CALL TOOLTEST  "binin8w.bin -c binin8w.conf -o" binin8w.h5
+$ !
+$ type sys$input 
+               Testing ASCII F64 - rank 1 - INPUT-CLASS TEXTFPE
+$ CALL TOOLTEST  "in64.txt -c textpfe.conf -o" test15.h5
 $
 $
 $ ! Delete temporary files