summaryrefslogtreecommitdiffstats
path: root/windows
diff options
context:
space:
mode:
authorJonathan Kim <jkm@hdfgroup.org>2010-09-17 00:22:29 (GMT)
committerJonathan Kim <jkm@hdfgroup.org>2010-09-17 00:22:29 (GMT)
commit3bfb10b2fc080b138ed8fb934c59b383fc292c98 (patch)
tree50daf2821c1f48a77983fc95a459888f4911ce55 /windows
parent696675029e4bd3461bc175fb9d9b3406767acbfd (diff)
downloadhdf5-3bfb10b2fc080b138ed8fb934c59b383fc292c98.zip
hdf5-3bfb10b2fc080b138ed8fb934c59b383fc292c98.tar.gz
hdf5-3bfb10b2fc080b138ed8fb934c59b383fc292c98.tar.bz2
[svn-r19411] Purpose:
Add extra test cases for Bug1975 h5diff - support recursive comparison on group when specified as an object Description: Merged from hdf5 trunk (r19409) Additional tests for combination of group recursive and --follow-symlinks with multi-linked external links with several files (same name/strucure). Tested: jam, amani, heiwa
Diffstat (limited to 'windows')
-rw-r--r--windows/tools/h5diff/testh5diff.bat27
1 files changed, 27 insertions, 0 deletions
diff --git a/windows/tools/h5diff/testh5diff.bat b/windows/tools/h5diff/testh5diff.bat
index d8c3100..32fe001 100644
--- a/windows/tools/h5diff/testh5diff.bat
+++ b/windows/tools/h5diff/testh5diff.bat
@@ -50,6 +50,10 @@ set srclnkfile1=h5diff_danglelinks1.h5
set srclnkfile2=h5diff_danglelinks2.h5
set src_grp_recurse1=h5diff_grp_recurse1.h5
set src_grp_recurse2=h5diff_grp_recurse2.h5
+set src_grp_recurse1_ext=h5diff_grp_recurse_ext1.h5
+set src_grp_recurse2_ext1=h5diff_grp_recurse_ext2-1.h5
+set src_grp_recurse2_ext2=h5diff_grp_recurse_ext2-2.h5
+set src_grp_recurse2_ext3=h5diff_grp_recurse_ext2-3.h5
set srcexclude1_1=h5diff_exclude1-1.h5
set srcexclude1_2=h5diff_exclude1-2.h5
set srcexclude2_1=h5diff_exclude2-1.h5
@@ -77,6 +81,10 @@ set lnkfile1=%indir%\h5diff_danglelinks1.h5
set lnkfile2=%indir%\h5diff_danglelinks2.h5
set grp_recurse1=%indir%\h5diff_grp_recurse1.h5
set grp_recurse2=%indir%\h5diff_grp_recurse2.h5
+set grp_recurse1_ext=%indir%\h5diff_grp_recurse_ext1.h5
+set grp_recurse2_ext1=%indir%\h5diff_grp_recurse_ext2-1.h5
+set grp_recurse2_ext2=%indir%\h5diff_grp_recurse_ext2-2.h5
+set grp_recurse2_ext3=%indir%\h5diff_grp_recurse_ext2-3.h5
set exclude1_1=%indir%\h5diff_exclude1-1.h5
set exclude1_2=%indir%\h5diff_exclude1-2.h5
set exclude2_1=%indir%\h5diff_exclude2-1.h5
@@ -794,6 +802,25 @@ rem ############################################################################
call :testing %h5diff% -v --follow-symlinks %src_grp_recurse1% %src_grp_recurse2% /slink_grp10 /slink_grp11
call :tooltest h5diff_514.txt -v --follow-symlinks %grp_recurse1% %grp_recurse2% /slink_grp10 /slink_grp11
+ rem ######################################################################
+ rem # Test for group recursive diff via multi-linked external links
+ rem # With follow-symlinks, file $GRP_RECURSE1_EXT and $GRP_RECURSE2_EXT1
+ rem # should be same with the external links.
+ rem ######################################################################
+ rem file vs file
+ call :testing %h5diff% -v %src_grp_recurse1_ext% %src_grp_recurse2_ext1%
+ call :tooltest h5diff_515.txt -v %grp_recurse1_ext% %grp_recurse2_ext1%
+
+ call :testing %h5diff% -v --follow-symlinks %src_grp_recurse1_ext% %src_grp_recurse2_ext1%
+ call :tooltest h5diff_516.txt -v --follow-symlinks %grp_recurse1_ext% %grp_recurse2_ext1%
+
+ rem group vs group
+ call :testing %h5diff% -v %src_grp_recurse1_ext% %src_grp_recurse2_ext1% /g1
+ call :tooltest h5diff_517.txt -v %grp_recurse1_ext% %grp_recurse2_ext1% /g1
+
+ call :testing %h5diff% -v --follow-symlinks %src_grp_recurse1_ext% %src_grp_recurse2_ext1% /g1
+ call :tooltest h5diff_518.txt -v --follow-symlinks %grp_recurse1_ext% %grp_recurse2_ext1% /g1
+
rem ##############################################################################
rem # Exclude objects (--exclude-object)