hdf5: Store the test comparison diff into a log file in case of mismatch

Signed-off-by: Martin Tzvetanov Grigorov <[email protected]>
openhpc · Oct 21, 2024 · 9e62612 · 9e62612
1 parent 0c7d006
commit 9e62612
Show file tree

Hide file tree

Showing 21 changed files with 110 additions and 19 deletions.
diff --git a/components/io-libs/hdf5/SPECS/hdf5.spec b/components/io-libs/hdf5/SPECS/hdf5.spec
@@ -25,6 +25,8 @@ URL:       http://www.hdfgroup.org/HDF5
 Source0:   https://github.com/HDFGroup/%{pname}/archive/refs/tags/%{pname}_%{version}.tar.gz
 
 BuildRequires: zlib-devel make
+BuildRequires: perl(File::Compare)
+BuildRequires: perl(File::Copy)
 
 %if "%{compiler_family}" == "intel"
 BuildRequires: libtool%{PROJ_DELIM}
@@ -68,8 +70,8 @@ autoreconf -if
 sed -e 's/NO_SYMBOLS_CFLAGS="-Wl,-s"/NO_SYMBOLS_CFLAGS=/g' -i config/intel-flags
 sed -e 's/NO_SYMBOLS_CFLAGS="-Wl,-s"/NO_SYMBOLS_CFLAGS=/g' -i config/intel-cxxflags
 # delete special flags no longer available
-echo "" > config/intel-warnings/18
-sed '/-Wp64/d' -i config/intel-warnings/15
+echo "" > config/intel-warnings/classic/18
+sed '/-Wp64/d' -i config/intel-warnings/classic/15
 %endif
 
 ./configure --prefix=%{install_path} \

diff --git a/tests/libs/hdf5/test-env-variables-new/C/H5D/test.sh.in b/tests/libs/hdf5/test-env-variables-new/C/H5D/test.sh.in
@@ -76,6 +76,7 @@ do
         if test $status -ne 0
         then
             echo "  FAILED!"
+            diff -u $srcdir/testfiles/$H5_LIBVER_DIR/$fname.tst tmp.test > $fname.tst.diff.log
         else
           dumpout $fname.h5 >tmp.test
           rm -f $fname.h5
@@ -84,6 +85,7 @@ do
           if test $status -ne 0
           then
               echo "  FAILED!"
+              diff -u $srcdir/testfiles/$H5_LIBVER_DIR/$fname.ddl tmp.test > $fname.ddl.diff.log
           else
               echo "  Passed"
           fi
@@ -120,6 +122,7 @@ else
     if test $status -ne 0
     then
         echo "  FAILED!"
+        diff -u $srcdir/testfiles/$H5_LIBVER_DIR/$fname.tst tmp.test > $fname.tst.diff.log
     else
         dumpout $fname.h5 >tmp.test
         rm -f $fname.h5
@@ -128,6 +131,7 @@ else
         if test $status -ne 0
         then
             echo "  FAILED!"
+            diff -u $srcdir/testfiles/$H5_LIBVER_DIR/$fname$USE_ALT.ddl tmp.test > $fname$USE_ALT.ddl.diff.log
         else
             echo "  Passed"
         fi
@@ -153,6 +157,7 @@ else
     if test $status -ne 0
     then
         echo "  FAILED!"
+        diff -u $srcdir/testfiles/$H5_LIBVER_DIR/$fname.tst tmp.test > $fname.tst.diff.log
     else
         dumpout -n $fname.h5 >tmp.test
         rm -f $fname.h5
@@ -161,6 +166,7 @@ else
         if test $status -ne 0
         then
             echo "  FAILED!"
+            diff -u $srcdir/testfiles/$H5_LIBVER_DIR/$fname.ddl tmp.test > $fname.ddl.diff.log
         else
             echo "  Passed"
         fi

diff --git a/tests/libs/hdf5/test-env-variables-new/C/H5G/test.sh.in b/tests/libs/hdf5/test-env-variables-new/C/H5G/test.sh.in
@@ -55,6 +55,7 @@ status=$?
 if test $status -ne 0
 then
     echo "  FAILED!"
+    diff -u $srcdir/testfiles/$H5_LIBVER_DIR/h5ex_g_create.ddl tmp.test > h5ex_g_create.ddl.diff.log
 else
     echo "  Passed"
 fi
@@ -75,6 +76,7 @@ status=$?
 if test $status -ne 0
 then
     echo "  FAILED!"
+    diff -u $srcdir/testfiles/$H5_LIBVER_DIR/h5ex_g_iterate.tst tmp.test > h5ex_g_iterate.tst.diff.log
 else
     echo "  Passed"
 fi
@@ -95,6 +97,7 @@ status=$?
 if test $status -ne 0
 then
     echo "  FAILED!"
+    diff -u $srcdir/testfiles/$H5_LIBVER_DIR/h5ex_g_traverse.tst tmp.test > h5ex_g_traverse.tst.diff.log
 else
     echo "  Passed"
 fi
@@ -115,6 +118,7 @@ status=$?
 if test $status -ne 0
 then
     echo "  FAILED!"
+    diff -u $srcdir/testfiles/$H5_LIBVER_DIR/h5ex_g_visit.tst tmp.test > h5ex_g_visit.tst.diff.log
 else
     echo "  Passed"
 fi
@@ -128,20 +132,23 @@ status=$?
 if test $status -ne 0
 then
     echo "  FAILED!"
+    diff -u $srcdir/testfiles/$H5_LIBVER_DIR/h5ex_g_compact.tst tmp.test > h5ex_g_compact.tst.diff.log
 else
   dumpout h5ex_g_compact1.h5 >tmp.test
   cmp -s tmp.test $srcdir/testfiles/$H5_LIBVER_DIR/h5ex_g_compact1.ddl
   status=$?
   if test $status -ne 0
   then
       echo "  FAILED!"
+      diff -u $srcdir/testfiles/$H5_LIBVER_DIR/h5ex_g_compact1.ddl tmp.test > h5ex_g_compact1.ddl.diff.log
   else
     dumpout h5ex_g_compact2.h5 >tmp.test
     cmp -s tmp.test $srcdir/testfiles/$H5_LIBVER_DIR/h5ex_g_compact2.ddl
     status=$?
     if test $status -ne 0
     then
         echo "  FAILED!"
+        diff -u $srcdir/testfiles/$H5_LIBVER_DIR/h5ex_g_compact2.ddl tmp.test > h5ex_g_compact2.ddl.diff.log
     else
         echo "  Passed"
     fi
@@ -159,6 +166,7 @@ status=$?
 if test $status -ne 0
 then
     echo "  FAILED!"
+    diff -u $srcdir/testfiles/$H5_LIBVER_DIR/h5ex_g_phase.tst tmp.test > h5ex_g_phase.tst.diff.log
 else
     echo "  Passed"
 fi
@@ -173,6 +181,7 @@ status=$?
 if test $status -ne 0
 then
     echo "  FAILED!"
+    diff -u $srcdir/testfiles/$H5_LIBVER_DIR/h5ex_g_corder.tst tmp.test > h5ex_g_corder.tst.diff.log
 else
     echo "  Passed"
 fi
@@ -187,6 +196,7 @@ status=$?
 if test $status -ne 0
 then
     echo "  FAILED!"
+    diff -u $srcdir/testfiles/$H5_LIBVER_DIR/h5ex_g_intermediate.tst tmp.test > h5ex_g_intermediate.tst.diff.log
 else
     echo "  Passed"
 fi

diff --git a/tests/libs/hdf5/test-env-variables-new/C/H5T/test.sh.in b/tests/libs/hdf5/test-env-variables-new/C/H5T/test.sh.in
@@ -68,6 +68,7 @@ do
     if test $status -ne 0
     then
         echo "  FAILED!"
+        diff -u $srcdir/testfiles/$H5_LIBVER_DIR/$fname.tst tmp.test > $fname.tst.diff.log
     else
         dumpout $fname.h5 >tmp.test
       rm -f $fname.h5
@@ -76,6 +77,7 @@ do
       if test $status -ne 0
       then
           echo "  FAILED!"
+          diff -u $srcdir/testfiles/$H5_LIBVER_DIR/$fname.ddl tmp.test > $fname.ddl.diff.log
       else
           echo "  Passed"
       fi
@@ -115,6 +117,7 @@ do
     if test $status -ne 0
     then
         echo "  FAILED!"
+        diff -u $srcdir/testfiles/$H5_LIBVER_DIR/$fname.tst tmp.test > $fname.tst.diff.log
     else
         dumpout $fname.h5 >tmp.test
       rm -f $fname.h5
@@ -123,6 +126,7 @@ do
       if test $status -ne 0
       then
           echo "  FAILED!"
+          diff -u $srcdir/testfiles/$H5_LIBVER_DIR/$fname$USE_ALT.ddl tmp.test > $fname$USE_ALT.ddl.diff.log
       else
           echo "  Passed"
       fi
@@ -138,6 +142,7 @@ status=$?
 if test $status -ne 0
 then
     echo "  FAILED!"
+    diff -u $srcdir/testfiles/$H5_LIBVER_DIR/$fname.tst tmp.test > $fname.tst.diff.log
 else
   dumpout -n $fname.h5 >tmp.test
   rm -f $fname.h5
@@ -146,6 +151,7 @@ else
   if test $status -ne 0
   then
       echo "  FAILED!"
+      diff -u $srcdir/testfiles/$H5_LIBVER_DIR/$fname.ddl tmp.test > $fname.ddl.diff.log
   else
       echo "  Passed"
   fi
@@ -161,6 +167,7 @@ status=$?
 if test $status -ne 0
 then
     echo "  FAILED!"
+    diff -u $srcdir/testfiles/$H5_LIBVER_DIR/$fname.tst tmp.test > $fname.tst.diff.log
 else
   dumpout -n $fname.h5 >tmp.test
   rm -f $fname.h5
@@ -169,6 +176,7 @@ else
   if test $status -ne 0
   then
       echo "  FAILED!"
+      diff -u $srcdir/testfiles/$H5_LIBVER_DIR/$fname.ddl tmp.test > $fname.ddl.diff.log
   else
       echo "  Passed"
   fi
@@ -184,6 +192,7 @@ status=$?
 if test $status -ne 0
 then
     echo "  FAILED!"
+    diff -u $srcdir/testfiles/$H5_LIBVER_DIR/$fname.tst tmp.test > $fname.tst.diff.log
 else
     echo "  Passed"
 fi

diff --git a/tests/libs/hdf5/test-env-variables-new/C/H5T/testfiles/114/h5ex_t_vlen.ddl b/tests/libs/hdf5/test-env-variables-new/C/H5T/testfiles/114/h5ex_t_vlen.ddl
@@ -1,7 +1,7 @@
 HDF5 "h5ex_t_vlen.h5" {
 GROUP "/" {
    DATASET "DS1" {
-      DATATYPE  H5T_VLEN { H5T_STD_I32LE}
+      DATATYPE  H5T_VLEN { H5T_STD_I32LE }
       DATASPACE  SIMPLE { ( 2 ) / ( 2 ) }
       DATA {
       (0): (3, 2, 1), (1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144)

diff --git a/tests/libs/hdf5/test-env-variables-new/C/H5T/testfiles/114/h5ex_t_vlenatt.ddl b/tests/libs/hdf5/test-env-variables-new/C/H5T/testfiles/114/h5ex_t_vlenatt.ddl
@@ -6,7 +6,7 @@ GROUP "/" {
       DATA {
       }
       ATTRIBUTE "A1" {
-         DATATYPE  H5T_VLEN { H5T_STD_I32LE}
+         DATATYPE  H5T_VLEN { H5T_STD_I32LE }
          DATASPACE  SIMPLE { ( 2 ) / ( 2 ) }
          DATA {
          (0): (3, 2, 1), (1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144)

diff --git a/tests/libs/hdf5/test-env-variables-new/FORTRAN/H5D/test.sh.in b/tests/libs/hdf5/test-env-variables-new/FORTRAN/H5D/test.sh.in
@@ -107,7 +107,8 @@ do
         if test $status -ne 0
         then
             echo "  FAILED!"
-	    return_val=`expr $status + $return_val`
+            diff -u $srcdir/testfiles/$H5_LIBVER_DIR/$fname.tst tmp.test > $fname.tst.diff.log
+            return_val=`expr $status + $return_val`
         else
           dumpout $fname.h5 >tmp.test
           rm -f $fname.h5
@@ -125,14 +126,15 @@ do
              if test $NumOfLines -gt $NumOfFinds 
              then
                 echo "  FAILED!"
-	        return_val=`expr $status + $return_val`
+                diff -u $srcdir/testfiles/$H5_LIBVER_DIR/$fname.ddl tmp.test > $fname.ddl.diff.log
+                return_val=`expr $status + $return_val`
              else
                 echo "  *Inconsequential differance* ... Passed"
-		return_val=`expr $return_val`
+                return_val=`expr $return_val`
              fi
           else
-              echo "  Passed"
-	      return_val=`expr $status + $return_val`
+             echo "  Passed"
+             return_val=`expr $status + $return_val`
           fi
         fi
     fi
@@ -166,6 +168,7 @@ else
     if test $status -ne 0
     then
         echo "  FAILED!"
+        diff -u $srcdir/testfiles/$H5_LIBVER_DIR/$fname.tst tmp.test > $fname.tst.diff.log
     else
         dumpout $fname.h5 >tmp.test
         rm -f $fname.h5
@@ -174,6 +177,7 @@ else
         if test $status -ne 0
         then
             echo "  FAILED!"
+            diff -u $srcdir/testfiles/$H5_LIBVER_DIR/$fname$USE_ALT.ddl tmp.test > $fname$USE_ALT.ddl.diff.log
         else
             echo "  Passed"
         fi
@@ -199,6 +203,7 @@ else
     if test $status -ne 0
     then
         echo "  FAILED!"
+        diff -u $srcdir/testfiles/$H5_LIBVER_DIR/$fname.tst tmp.test > $fname.tst.diff.log
     else
         dumpout -n $fname.h5 >tmp.test
         rm -f $fname.h5
@@ -207,6 +212,7 @@ else
         if test $status -ne 0
         then
             echo "  FAILED!"
+            diff -u $srcdir/testfiles/$H5_LIBVER_DIR/$fname.ddl tmp.test > $fname.ddl.diff.log
         else
             echo "  Passed"
         fi

diff --git a/tests/libs/hdf5/test-env-variables-new/FORTRAN/H5G/test.sh.in b/tests/libs/hdf5/test-env-variables-new/FORTRAN/H5G/test.sh.in
@@ -55,6 +55,7 @@ status=$?
 if test $status -ne 0
 then
     echo "  FAILED!"
+    diff -u $srcdir/testfiles/$H5_LIBVER_DIR/h5ex_g_create.ddl tmp.test > h5ex_g_create.ddl.diff.log
 else
     echo "  Passed"
 fi
@@ -69,13 +70,15 @@ status=$?
 if test $status -ne 0
 then
     echo "  FAILED!"
+    diff -u $srcdir/testfiles/$H5_LIBVER_DIR/h5ex_g_compact1.ddl tmp.test > h5ex_g_compact1.ddl.diff.log
 else
   dumpout h5ex_g_compact2.h5 >tmp.test
   cmp -s tmp.test $srcdir/testfiles/$H5_LIBVER_DIR/h5ex_g_compact2.ddl
   status=$?
   if test $status -ne 0
   then
       echo "  FAILED!"
+      diff -u $srcdir/testfiles/$H5_LIBVER_DIR/h5ex_g_compact2.ddl tmp.test > h5ex_g_compact2.ddl.diff.log
   else
       echo "  Passed"
   fi
@@ -92,6 +95,7 @@ status=$?
 if test $status -ne 0
 then
     echo "  FAILED!"
+    diff -u $srcdir/testfiles/$H5_LIBVER_DIR/h5ex_g_phase.tst tmp.test > h5ex_g_phase.tst.diff.log
 else
     echo "  Passed"
 fi
@@ -106,6 +110,7 @@ status=$?
 if test $status -ne 0
 then
     echo "  FAILED!"
+    diff -u $srcdir/testfiles/$H5_LIBVER_DIR/h5ex_g_corder.tst tmp.test > h5ex_g_corder.tst.diff.log
 else
     echo "  Passed"
 fi