Fix error handling issues

10 files changed, 25 insertions, 21 deletions

diff --git a/tools/test/h5diff/CMakeTests.cmake b/tools/test/h5diff/CMakeTests.cmake
index 165c29a..b5dd820 100644
--- a/tools/test/h5diff/CMakeTests.cmake
+++ b/tools/test/h5diff/CMakeTests.cmake
@@ -1441,22 +1441,22 @@ ADD_H5_TEST (h5diff_415 1 --follow-symlinks -v ${FILE14} ${FILE14} /softlink3_to
 ADD_H5_TEST (h5diff_416 0 --follow-symlinks -v ${FILE14} ${FILE14} /softlink3_to_slink2 /softlink4_to_slink2)
 
 # non-exist-softlink vs softlink"
-ADD_H5_TEST (h5diff_417 2 --follow-symlinks -v ${FILE13} ${FILE13} /softlink_noexist /softlink_dset2)
+ADD_H5_TEST (h5diff_417 1 --follow-symlinks -v ${FILE13} ${FILE13} /softlink_noexist /softlink_dset2)
 
 # softlink vs non-exist-softlink"
-ADD_H5_TEST (h5diff_418 2 --follow-symlinks -v ${FILE13} ${FILE13} /softlink_dset2 /softlink_noexist)
+ADD_H5_TEST (h5diff_418 1 --follow-symlinks -v ${FILE13} ${FILE13} /softlink_dset2 /softlink_noexist)
 
 # non-exist-extlink_file vs extlink"
-ADD_H5_TEST (h5diff_419 2 --follow-symlinks -v ${FILE15} ${FILE15} /ext_link_noexist2 /ext_link_dset2)
+ADD_H5_TEST (h5diff_419 1 --follow-symlinks -v ${FILE15} ${FILE15} /ext_link_noexist2 /ext_link_dset2)
 
 # exlink vs non-exist-extlink_file"
-ADD_H5_TEST (h5diff_420 2 --follow-symlinks -v ${FILE15} ${FILE15} /ext_link_dset2 /ext_link_noexist2)
+ADD_H5_TEST (h5diff_420 1 --follow-symlinks -v ${FILE15} ${FILE15} /ext_link_dset2 /ext_link_noexist2)
 
 # extlink vs non-exist-extlink_obj"
-ADD_H5_TEST (h5diff_421 2 --follow-symlinks -v ${FILE15} ${FILE15} /ext_link_dset2 /ext_link_noexist1)
+ADD_H5_TEST (h5diff_421 1 --follow-symlinks -v ${FILE15} ${FILE15} /ext_link_dset2 /ext_link_noexist1)
 
 # non-exist-extlink_obj vs extlink"
-ADD_H5_TEST (h5diff_422 2 --follow-symlinks -v ${FILE15} ${FILE15} /ext_link_noexist1 /ext_link_dset2)
+ADD_H5_TEST (h5diff_422 1 --follow-symlinks -v ${FILE15} ${FILE15} /ext_link_noexist1 /ext_link_dset2)
 
 # extlink_to_softlink_to_dset1 vs dset2"
 ADD_H5_TEST (h5diff_423 1 --follow-symlinks -v ${FILE17} ${FILE18} /ext_link_to_slink1 /dset2)
@@ -1512,11 +1512,11 @@ ADD_H5_TEST (h5diff_465 0 --follow-symlinks h5diff_danglelinks1.h5 h5diff_dangle
 # soft dangling vs. soft dangling
 ADD_H5_TEST (h5diff_466 0 -v --follow-symlinks h5diff_danglelinks1.h5 h5diff_danglelinks2.h5 /soft_link1)
 # soft link  vs. soft dangling
-ADD_H5_TEST (h5diff_467 2 -v --follow-symlinks h5diff_danglelinks1.h5 h5diff_danglelinks2.h5 /soft_link2)
+ADD_H5_TEST (h5diff_467 1 -v --follow-symlinks h5diff_danglelinks1.h5 h5diff_danglelinks2.h5 /soft_link2)
 # ext dangling vs. ext dangling
 ADD_H5_TEST (h5diff_468 0 -v --follow-symlinks h5diff_danglelinks1.h5 h5diff_danglelinks2.h5 /ext_link4)
 # ext link vs. ext dangling
-ADD_H5_TEST (h5diff_469 2 -v --follow-symlinks h5diff_danglelinks1.h5 h5diff_danglelinks2.h5 /ext_link2)
+ADD_H5_TEST (h5diff_469 1 -v --follow-symlinks h5diff_danglelinks1.h5 h5diff_danglelinks2.h5 /ext_link2)
 
 #---------------------------------------------------
 # dangling links without follow symlink
@@ -1655,7 +1655,7 @@ ADD_H5_TEST (h5diff_v3 0 -c ${FILEV1} ${FILEV2})
 ##############################################################################
 if (BUILD_SHARED_LIBS)
   ADD_H5_UD_TEST (h5diff_plugin_test 0 h5diff_ud -v tudfilter.h5 tudfilter2.h5)
-  ADD_H5_UD_TEST (h5diff_plugin_fail 2 h5diff_udfail -v tudfilter.h5 tudfilter2.h5)
+  ADD_H5_UD_TEST (h5diff_plugin_fail 0 h5diff_udfail -v tudfilter.h5 tudfilter2.h5)
 endif ()
 
 # ##############################################################################
diff --git a/tools/test/h5diff/testfiles/h5diff_417.txt b/tools/test/h5diff/testfiles/h5diff_417.txt
index 29d467a..0ea2542 100644
--- a/tools/test/h5diff/testfiles/h5diff_417.txt
+++ b/tools/test/h5diff/testfiles/h5diff_417.txt
@@ -1,3 +1,3 @@
 obj1 </softlink_noexist> is a dangling link.
 1 differences found
-EXIT CODE: 2
+EXIT CODE: 1
diff --git a/tools/test/h5diff/testfiles/h5diff_418.txt b/tools/test/h5diff/testfiles/h5diff_418.txt
index b6173d9..46222bb 100644
--- a/tools/test/h5diff/testfiles/h5diff_418.txt
+++ b/tools/test/h5diff/testfiles/h5diff_418.txt
@@ -1,3 +1,3 @@
 obj2 </softlink_noexist> is a dangling link.
 1 differences found
-EXIT CODE: 2
+EXIT CODE: 1
diff --git a/tools/test/h5diff/testfiles/h5diff_419.txt b/tools/test/h5diff/testfiles/h5diff_419.txt
index ee6e831..387c600 100644
--- a/tools/test/h5diff/testfiles/h5diff_419.txt
+++ b/tools/test/h5diff/testfiles/h5diff_419.txt
@@ -1,3 +1,3 @@
 obj1 </ext_link_noexist2> is a dangling link.
 1 differences found
-EXIT CODE: 2
+EXIT CODE: 1
diff --git a/tools/test/h5diff/testfiles/h5diff_420.txt b/tools/test/h5diff/testfiles/h5diff_420.txt
index 67c22ba..f3e65d9 100644
--- a/tools/test/h5diff/testfiles/h5diff_420.txt
+++ b/tools/test/h5diff/testfiles/h5diff_420.txt
@@ -1,3 +1,3 @@
 obj2 </ext_link_noexist2> is a dangling link.
 1 differences found
-EXIT CODE: 2
+EXIT CODE: 1
diff --git a/tools/test/h5diff/testfiles/h5diff_421.txt b/tools/test/h5diff/testfiles/h5diff_421.txt
index 7fd70ee..833c60c 100644
--- a/tools/test/h5diff/testfiles/h5diff_421.txt
+++ b/tools/test/h5diff/testfiles/h5diff_421.txt
@@ -1,3 +1,3 @@
 obj2 </ext_link_noexist1> is a dangling link.
 1 differences found
-EXIT CODE: 2
+EXIT CODE: 1
diff --git a/tools/test/h5diff/testfiles/h5diff_422.txt b/tools/test/h5diff/testfiles/h5diff_422.txt
index d1114af..3e675d5 100644
--- a/tools/test/h5diff/testfiles/h5diff_422.txt
+++ b/tools/test/h5diff/testfiles/h5diff_422.txt
@@ -1,3 +1,3 @@
 obj1 </ext_link_noexist1> is a dangling link.
 1 differences found
-EXIT CODE: 2
+EXIT CODE: 1
diff --git a/tools/test/h5diff/testfiles/h5diff_467.txt b/tools/test/h5diff/testfiles/h5diff_467.txt
index 35d3b74..f5195c0 100644
--- a/tools/test/h5diff/testfiles/h5diff_467.txt
+++ b/tools/test/h5diff/testfiles/h5diff_467.txt
@@ -1,3 +1,3 @@
 obj2 </soft_link2> is a dangling link.
 1 differences found
-EXIT CODE: 2
+EXIT CODE: 1
diff --git a/tools/test/h5diff/testfiles/h5diff_469.txt b/tools/test/h5diff/testfiles/h5diff_469.txt
index 23cb62f..594fd80 100644
--- a/tools/test/h5diff/testfiles/h5diff_469.txt
+++ b/tools/test/h5diff/testfiles/h5diff_469.txt
@@ -1,3 +1,3 @@
 obj2 </ext_link2> is a dangling link.
 1 differences found
-EXIT CODE: 2
+EXIT CODE: 1
diff --git a/tools/test/h5diff/testfiles/h5diff_udfail.txt b/tools/test/h5diff/testfiles/h5diff_udfail.txt
index c154c6b..aac5528 100644
--- a/tools/test/h5diff/testfiles/h5diff_udfail.txt
+++ b/tools/test/h5diff/testfiles/h5diff_udfail.txt
@@ -1,12 +1,16 @@
 
 file1     file2
 ---------------------------------------
-    x      x    /              
-    x      x    /dynlibud      
+    x      x    /
+    x      x    /dynlibud
 
 group  : </> and </>
 0 differences found
 dataset: </dynlibud> and </dynlibud>
 0 differences found
-warning: dataset </dynlibud> cannot be read, user defined filter is not available
-EXIT CODE: 2
+--------------------------------
+Some objects are not comparable
+--------------------------------
+Use -c for a list of objects without details of differences.
+Warning: dataset </dynlibud> cannot be read, user defined filter is not available
+EXIT CODE: 0