From eb059764bb5306741f4adb7969dad533c3536f5e Mon Sep 17 00:00:00 2001 From: Jonathan Kim Date: Mon, 18 Oct 2010 16:40:56 -0500 Subject: [svn-r19628] Because h5diff fix (bug1975) which can compare groups recursively, h5copy diff tests no longer should fail. --- windows/tools/h5copy/testh5copy.bat | 12 ++++++------ 1 file changed, 6 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 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% -- cgit v0.12