diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2010-04-29 22:05:47 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2010-04-29 22:05:47 (GMT) |
| commit | 616e1be117ec1a625ce7d239fe8f81f187c991c4 (patch) | |
| tree | fd7b05014c7c1465ca75198c004e73cf19e8b755 | |
| parent | 010e44125b730d1cba401f2b58908695068dd488 (diff) | |
| download | hdf5-616e1be117ec1a625ce7d239fe8f81f187c991c4.zip hdf5-616e1be117ec1a625ce7d239fe8f81f187c991c4.tar.gz hdf5-616e1be117ec1a625ce7d239fe8f81f187c991c4.tar.bz2 | |
[svn-r18675] Updated scripts for H5copy r18398 and H5ls r18642
| -rw-r--r-- | windows/tools/h5copy/testh5copy.bat | 54 | ||||
| -rw-r--r-- | windows/tools/h5ls/testh5ls.bat | 2 |
2 files changed, 54 insertions, 2 deletions
diff --git a/windows/tools/h5copy/testh5copy.bat b/windows/tools/h5copy/testh5copy.bat index a0e164a..26f1b2c 100644 --- a/windows/tools/h5copy/testh5copy.bat +++ b/windows/tools/h5copy/testh5copy.bat @@ -49,6 +49,9 @@ set verbose=yes set srcfile1=h5copytst.h5
set srcfile2=h5copy_ref.h5
+set hdf_ext_src_file=h5copy_extlinks_src.h5
+set hdf_ext_trg_file=h5copy_extlinks_trg.h5
+
set indir=%CD%\testfiles
set outdir=%CD%\..\testfiles
@@ -378,7 +381,55 @@ rem <none> )
exit /b
-
+
+rem Copy external links.
+rem adding to the destination file each time compare the result
+rem
+rem Assumed arguments:
+rem <none>
+:copy_ext_links
+
+ set testfile=%indir%\%hdf_ext_src_file%
+ set fileout=%outdir%\%hdf_ext_src_file:.h5=.out.h5%
+
+ rem Remove any output file left over from previous test run
+ del /f %fileout% 2> nul
+
+ echo.Test copying external link directly without -f ext
+ call :tooltest -v -i %testfile% -o %fileout% -s /group_ext/extlink_dset -d /copy1_dset
+
+ echo.Test copying external link directly with -f ext
+ call :tooltest -f ext -i %testfile% -o %fileout% -v -s /group_ext/extlink_dset -d /copy2_dset
+
+ echo.Test copying dangling external link (no obj) directly without -f ext
+ call :tooltest -i %testfile% -o %fileout% -v -s /group_ext/extlink_notyet1 -d /copy_dangle1_1
+
+ echo.Test copying dangling external link (no obj) directly with -f ext
+ call :tooltest -f ext -i %testfile% -o %fileout% -v -s /group_ext/extlink_notyet1 -d /copy_dangle1_2
+
+ echo.Test copying dangling external link (no file) directly without -f ext
+ call :tooltest -i %testfile% -o %fileout% -v -s /group_ext/extlink_notyet2 -d /copy_dangle2_1
+
+ echo.Test copying dangling external link (no file) directly with -f ext
+ call :tooltest -f ext -i %testfile% -o %fileout% -v -s /group_ext/extlink_notyet2 -d /copy_dangle2_2
+
+ echo.Test copying a group contains external links without -f ext
+ call :tooltest -v -i %testfile% -o %fileout% -s /group_ext -d /copy1_group
+
+ echo.Test copying a group contains external links with -f ext
+ call :tooltest -f ext -i %testfile% -o %fileout% -v -f ext -s /group_ext -d /copy2_group
+
+ rem Verify that the file created above is correct
+ call :h5lstest %fileout%
+
+ rem Remove output file created, if the "no cleanup" environment variable is
+ rem not defined
+ if not defined HDF5_NOCLEANUP (
+ del /f %fileout%
+ )
+
+ exit /b
+
rem ##############################################################################
rem ### T H E T E S T S ###
rem ##############################################################################
@@ -386,6 +437,7 @@ rem ############################################################################ :main
call :copyobjects
call :copyreferences
+ call :copy_ext_links
if %nerrors% equ 0 (
echo.All h5copy tests passed.
diff --git a/windows/tools/h5ls/testh5ls.bat b/windows/tools/h5ls/testh5ls.bat index bf0cb5e..90321e5 100644 --- a/windows/tools/h5ls/testh5ls.bat +++ b/windows/tools/h5ls/testh5ls.bat @@ -216,7 +216,7 @@ rem ############################################################################ rem tests for error handling.
rem test for non-existing file
- call :tooltest nosuchfile.ls 0 nosuchfile.h5
+ call :tooltest nosuchfile.ls 1 nosuchfile.h5
rem test for variable length data types in verbose mode
call :tooltest tvldtypes2le.ls 0 -v tvldtypes1.h5
|