From 7603d2c8be5418370467f14e8c180a0280c0d557 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Fri, 14 Aug 2020 16:39:40 -0500
Subject: HDFFV-9984 fix test logic

---
 tools/test/h5repack/CMakeTests.cmake | 7 +++----
 tools/test/h5repack/h5repack.sh.in   | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/tools/test/h5repack/CMakeTests.cmake b/tools/test/h5repack/CMakeTests.cmake
index 1bf3fa2..af73b75 100644
--- a/tools/test/h5repack/CMakeTests.cmake
+++ b/tools/test/h5repack/CMakeTests.cmake
@@ -1626,16 +1626,15 @@ ADD_H5_DMP_TEST (textlinkfar-base "TEST" 0 textlinkfar.h5 --enable-error-stack)
 ADD_H5_DMP_TEST (textlinksrc-base "TEST" 0 textlinksrc.h5 --enable-error-stack)
 ADD_H5_DMP_TEST (textlinktar-base "TEST" 0 textlinktar.h5 --enable-error-stack)
 
-### HDFFV-11128 needs fixed to enable the following test
-#ADD_H5_DIFF_TEST (textlinksrc-merge "TEST" 1 textlinksrc.h5 --merge)
+ADD_H5_DIFF_TEST (h5copy_extlinks_src-merge "TEST" 0 h5copy_extlinks_src.h5 --merge)
 ADD_H5_DIFF_TEST (tsoftlinks-merge "TEST" 1 tsoftlinks.h5 --merge)
 ADD_H5_DIFF_TEST (textlink-merge "TEST" 0 textlink.h5 --merge)
 ### HDFFV-11128 needs fixed to enable the following test
 #ADD_H5_DIFF_TEST (textlinkfar-merge "TEST" 1 textlinkfar.h5 --merge)
 ### HDFFV-11128 needs fixed to enable the following test
-#ADD_H5_DIFF_TEST (textlinktar-merge "TEST" 1 textlinktar.h5 --merge)
+#ADD_H5_DIFF_TEST (textlinksrc-merge "TEST" 1 textlinksrc.h5 --merge)
 ### HDFFV-11128 needs fixed to enable the following test
-#ADD_H5_DIFF_TEST (h5copy_extlinks_src-merge "TEST" 0 h5copy_extlinks_src.h5 --merge)
+#ADD_H5_DIFF_TEST (textlinktar-merge "TEST" 1 textlinktar.h5 --merge)
 
 ADD_H5_DMP_TEST (h5copy_extlinks_src-prune "TEST" 0 h5copy_extlinks_src.h5 --prune --enable-error-stack)
 ADD_H5_DMP_TEST (tsoftlinks-prune "TEST" 0 tsoftlinks.h5 --prune --enable-error-stack)
diff --git a/tools/test/h5repack/h5repack.sh.in b/tools/test/h5repack/h5repack.sh.in
index e4ae008..02f515c 100644
--- a/tools/test/h5repack/h5repack.sh.in
+++ b/tools/test/h5repack/h5repack.sh.in
@@ -871,13 +871,13 @@ TOOLTESTSV()
     nerrors="`expr $nerrors + 1`"
     else
     echo " PASSED"
-    VERIFY h5diff unequal $@
+    VERIFY h5diff equal $@
     (
         cd $TESTDIR
         $RUNSERIAL $H5DIFF_BIN -v $infile $outfile
     ) >$actual 2>$actual_err
     RET=$?
-    if [ $RET == 0 ] ; then
+    if [ $RET != 0 ] ; then
          echo "*FAILED*"
          nerrors="`expr $nerrors + 1`"
     else
-- 
cgit v0.12