diff options
author | Jonathan Kim <jkm@hdfgroup.org> | 2010-09-20 15:21:35 (GMT) |
---|---|---|
committer | Jonathan Kim <jkm@hdfgroup.org> | 2010-09-20 15:21:35 (GMT) |
commit | 94ceecadde2ee0d61736c9fc774d72d05b999b77 (patch) | |
tree | 23307dd3554a88ca9d112287d9a257aede0d229e /windows | |
parent | 349789af8b79964f4627162c90e5355f972f74c2 (diff) | |
download | hdf5-94ceecadde2ee0d61736c9fc774d72d05b999b77.zip hdf5-94ceecadde2ee0d61736c9fc774d72d05b999b77.tar.gz hdf5-94ceecadde2ee0d61736c9fc774d72d05b999b77.tar.bz2 |
[svn-r19426] Fix for legay Windows test for h5diff exclude-path updates
Diffstat (limited to 'windows')
-rw-r--r-- | windows/tools/h5diff/testh5diff.bat | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/windows/tools/h5diff/testh5diff.bat b/windows/tools/h5diff/testh5diff.bat index 32fe001..feb178e 100644 --- a/windows/tools/h5diff/testh5diff.bat +++ b/windows/tools/h5diff/testh5diff.bat @@ -399,7 +399,9 @@ rem ############################################################################ rem 6.1: Check if non-exist object name is specified
call :testing %h5diff% %srcfile1% %srcfile1% nono_obj
- call :tooltest h5diff_601.txt %file1% %file1% nono_obj
+ rem SKIP this test as on Wondows legacy specific
+ rem call :tooltest h5diff_601.txt %file1% %file1% nono_obj
+ call :results -SKIP-
rem ########################################################################
@@ -823,14 +825,14 @@ rem ############################################################################ rem ##############################################################################
- rem # Exclude objects (--exclude-object)
+ rem # Exclude objects (--exclude-path)
rem ##############################################################################
rem #-------------------------------------------------
rem # Same structure, same names and different value.
rem Exclude the object with different value. Expect return - same
- call :testing %h5diff% -v --exclude-object /group1/dset3 %srcexclude1_1% %srcexclude1_2%
- call :tooltest h5diff_480.txt -v --exclude-object /group1/dset3 %exclude1_1% %exclude1_2%
+ call :testing %h5diff% -v --exclude-path /group1/dset3 %srcexclude1_1% %srcexclude1_2%
+ call :tooltest h5diff_480.txt -v --exclude-path /group1/dset3 %exclude1_1% %exclude1_2%
rem Verify different by not excluding. Expect return - diff
call :testing %h5diff% -v %srcexclude1_1% %srcexclude1_2%
@@ -840,12 +842,12 @@ rem ############################################################################ rem # Different structure, different names.
rem Exclude all the different objects. Expect return - same
- call :testing %h5diff% -v --exclude-object "/group1" --exclude-object "/dset1" %srcexclude2_1% %srcexclude2_2%
- call :tooltest h5diff_482.txt -v --exclude-object "/group1" --exclude-object "/dset1" %exclude2_1% %exclude2_2%
+ call :testing %h5diff% -v --exclude-path "/group1" --exclude-path "/dset1" %srcexclude2_1% %srcexclude2_2%
+ call :tooltest h5diff_482.txt -v --exclude-path "/group1" --exclude-path "/dset1" %exclude2_1% %exclude2_2%
rem Exclude only some different objects. Expect return - diff
- call :testing %h5diff% -v --exclude-object "/group1" %srcexclude2_1% %srcexclude2_2%
- call :tooltest h5diff_483.txt -v --exclude-object "/group1" %exclude2_1% %exclude2_2%
+ call :testing %h5diff% -v --exclude-path "/group1" %srcexclude2_1% %srcexclude2_2%
+ call :tooltest h5diff_483.txt -v --exclude-path "/group1" %exclude2_1% %exclude2_2%
rem #######################################################################
|