summaryrefslogtreecommitdiffstats
path: root/windows/tools
diff options
context:
space:
mode:
authorJonathan Kim <jkm@hdfgroup.org>2010-11-02 16:57:16 (GMT)
committerJonathan Kim <jkm@hdfgroup.org>2010-11-02 16:57:16 (GMT)
commit13c16c89823a412f3d6504f249836c7ed73f5c81 (patch)
tree44ac93eb296b0602faf8492e89d3ab6e9102f6ca /windows/tools
parentd3770ffaefbf34b502ca31fbbcd3ffab565c70b2 (diff)
downloadhdf5-13c16c89823a412f3d6504f249836c7ed73f5c81.zip
hdf5-13c16c89823a412f3d6504f249836c7ed73f5c81.tar.gz
hdf5-13c16c89823a412f3d6504f249836c7ed73f5c81.tar.bz2
[svn-r19713] Purpose:
Fixed h5diff to handle variable-length strings in a compound dataset correctly. Also variable-length string array in a compound dataset. Bug #1989. Description: Garbage values were displayed when h5diff compared variable-length strings (or string array) in a compound type dataset. Merged from hdf5 trunk r19712. Tested: jam (linux32-LE), heiwa (linuxppc64-BE)
Diffstat (limited to 'windows/tools')
-rw-r--r--windows/tools/h5diff/testh5diff.bat8
1 files changed, 8 insertions, 0 deletions
diff --git a/windows/tools/h5diff/testh5diff.bat b/windows/tools/h5diff/testh5diff.bat
index 29be753..f745c42 100644
--- a/windows/tools/h5diff/testh5diff.bat
+++ b/windows/tools/h5diff/testh5diff.bat
@@ -58,6 +58,7 @@ set srcexclude1_1=h5diff_exclude1-1.h5
set srcexclude1_2=h5diff_exclude1-2.h5
set srcexclude2_1=h5diff_exclude2-1.h5
set srcexclude2_2=h5diff_exclude2-2.h5
+set src_comp_vl_strs=h5diff_comp_vl_strs.h5
set file1=%indir%\h5diff_basic1.h5
set file2=%indir%\h5diff_basic2.h5
@@ -89,6 +90,7 @@ set exclude1_1=%indir%\h5diff_exclude1-1.h5
set exclude1_2=%indir%\h5diff_exclude1-2.h5
set exclude2_1=%indir%\h5diff_exclude2-1.h5
set exclude2_2=%indir%\h5diff_exclude2-2.h5
+set comp_vl_strs=%indir%\h5diff_comp_vl_strs.h5
rem The tool name
@@ -853,6 +855,12 @@ rem ############################################################################
call :testing %h5diff% -v --exclude-path "/dset3" %srcexclude1_1% %srcexclude1_2% /group1
call :tooltest h5diff_484.txt -v --exclude-path "/dset3" %exclude1_1% %exclude1_2% /group1
+ rem ##############################################################################
+ rem # diff various multiple vlen and fixed strings in a compound type dataset
+ rem ##############################################################################
+ call :testing %h5diff% -v %src_comp_vl_strs% %src_comp_vl_strs%
+ call :tooltest h5diff_530.txt -v %comp_vl_strs% %comp_vl_strs%
+
rem #######################################################################
rem # END