4 files changed, 23 insertions, 6 deletions
diff --git a/windows/tools/h5copy/testh5copy.bat b/windows/tools/h5copy/testh5copy.bat
index 26f1b2c..495081c 100644
--- a/windows/tools/h5copy/testh5copy.bat
+++ b/windows/tools/h5copy/testh5copy.bat
@@ -84,7 +84,7 @@ rem
     for %%a in (%*) do (
         if %%a neq PASSED (
         if %%a neq *FAILED* (
-            set verify_msg=!test_msg! %%~nxa
+            set verify_msg=!verify_msg! %%~nxa
         ) )
     )
     set verify_msg=%verify_msg%                                                                
@@ -100,7 +100,7 @@ rem
     for %%a in (%*) do (
         if %%a neq PASSED (
         if %%a neq *FAILED* (
-            set verifyh5ls_msg=!test_msg! %%~nxa
+            set verifyh5ls_msg=!verifyh5ls_msg! %%~nxa
         ) )
     )
     set verifyh5ls_msg=%verifyh5ls_msg%                                                                
@@ -330,17 +330,17 @@ rem <none>
     call :tooltest -i %testfile% -o %fileout% -v -s /grp_dsets/simple  -d /grp_dsets/simple_group
 
     echo.Test copying ^& renaming group
-    call :tooltest_fail -i %testfile% -o %fileout% -v -s grp_dsets  -d grp_rename
+    call :tooltest -i %testfile% -o %fileout% -v -s grp_dsets  -d grp_rename
 
     echo.Test copying 'full' group hierarchy into group in destination file
-    call :tooltest_fail -i %testfile% -o %fileout% -v -s grp_dsets  -d /grp_rename/grp_dsets
+    call :tooltest -i %testfile% -o %fileout% -v -s grp_dsets  -d /grp_rename/grp_dsets
 
     echo.Test copying objects into group hier. that doesn't exist yet in destination file
     call :tooltest -i %testfile% -o %fileout% -vp -s simple    -d /A/B1/simple
     call :tooltest -i %testfile% -o %fileout% -vp -s simple    -d /A/B2/simple2
     call :tooltest -i %testfile% -o %fileout% -vp -s /grp_dsets/simple    -d /C/D/simple
-    call :tooltest_fail -i %testfile% -o %fileout% -vp -s /grp_dsets -d /E/F/grp_dsets
-    call :tooltest_fail -i %testfile% -o %fileout% -vp -s /grp_nested -d /G/H/grp_nested
+    call :tooltest -i %testfile% -o %fileout% -vp -s /grp_dsets -d /E/F/grp_dsets
+    call :tooltest -i %testfile% -o %fileout% -vp -s /grp_nested -d /G/H/grp_nested
 
     rem Verify that the file created above is correct
     call :h5lstest %fileout%
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
diff --git a/windows/tools/h5dump/testh5dump.bat b/windows/tools/h5dump/testh5dump.bat
index e776c07..e7edd1a 100644
--- a/windows/tools/h5dump/testh5dump.bat
+++ b/windows/tools/h5dump/testh5dump.bat
@@ -299,6 +299,9 @@ rem ############################################################################
 rem ############################################################################
 :main
 
+    rem test for signed/unsigned datasets
+    call :tooltest packedbits.ddl packedbits.h5
+
     rem test for displaying groups
     call :tooltest tgroup-1.ddl tgroup.h5
     rem test for displaying the selected groups
@@ -607,6 +610,9 @@ rem ############################################################################
     rem tests for traversal of external links
     call :tooltest textlinksrc.ddl textlinksrc.h5
     call :tooltest textlinkfar.ddl textlinkfar.h5
+
+    rem test for dangling external links
+    call :tooltest textlink.ddl textlink.h5
     
     
     
diff --git a/windows/tools/h5ls/testh5ls.bat b/windows/tools/h5ls/testh5ls.bat
index 953216d..f15274c 100644
--- a/windows/tools/h5ls/testh5ls.bat
+++ b/windows/tools/h5ls/testh5ls.bat
@@ -218,6 +218,9 @@ rem ############################################################################
 
     rem test for the nested compound type
     call :tooltest tnestcomp-1.ls 0 -w80 -r -d tnestedcomp.h5
+    call :tooltest tnestcomp-2.ls 0 -w80 -r -d -S tnestedcomp.h5
+    call :tooltest tnestcomp-3.ls 0 -w80 -r -d -l tnestedcomp.h5
+    call :tooltest tnestcomp-4.ls 0 -w80 -r -d -l -S tnestedcomp.h5
 
     rem test for loop detection
     call :tooltest tloop-1.ls 0 -w80 -r -d tloop.h5