Correct Fortran test scripts and remove old files

HDFGroup · Nov 27, 2023 · d39e89c · d39e89c
1 parent 6146cd6
commit d39e89c
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 253 deletions.
diff --git a/C/H5D/test.sh.in b/C/H5D/test.sh.in
@@ -111,11 +111,14 @@ version_compare "$H5_LIBVER" "1.8.23"
 if [ "$version_lt" = 1 ]; then
     USE_ALT="22"
 else
-# check if HDF5 version is < 1.10.8
-  version_compare "$H5_LIBVER" "1.10.8"
-  if [ "$version_lt" = 1 ]; then
-    USE_ALT="07"
-    nbitdir="110"
+# check if HDF5 version is >= 1.10.0 and < 1.10.8
+  version_compare "$H5_LIBVER" "1.10.0"
+  if [ "$version_lt" = 0 ]; then
+    version_compare "$H5_LIBVER" "1.10.8"
+    if [ "$version_lt" = 1 ]; then
+      USE_ALT="07"
+      nbitdir="110"
+    fi
   fi
 fi
 

diff --git a/C/H5T/test.sh.in b/C/H5T/test.sh.in
@@ -130,7 +130,12 @@ do
         else
             version_compare "$H5_LIBVER" "1.12.0"
             if [ "$version_lt" = 1 ]; then
-                cmp -s tmp.test $srcdir/tfiles/110/$fname$USE_ALT.ddl
+               version_compare "$H5_LIBVER" "1.10.7"
+               if [ "$version_lt" = 1 ]; then
+                  cmp -s tmp.test $srcdir/tfiles/110/$fname$USE_ALT.ddl
+               else
+                  cmp -s tmp.test $srcdir/tfiles/18/$fname.ddl
+               fi
             else
                 cmp -s tmp.test $srcdir/tfiles/112/$fname.ddl
             fi

diff --git a/C/H5T/tfiles/18/112/h5ex_t_objref.ddl b/C/H5T/tfiles/18/112/h5ex_t_objref.ddl
diff --git a/C/H5T/tfiles/18/112/h5ex_t_objrefatt.ddl b/C/H5T/tfiles/18/112/h5ex_t_objrefatt.ddl
diff --git a/C/H5T/tfiles/18/112/h5ex_t_regref.ddl b/C/H5T/tfiles/18/112/h5ex_t_regref.ddl
diff --git a/C/H5T/tfiles/18/112/h5ex_t_regrefatt.ddl b/C/H5T/tfiles/18/112/h5ex_t_regrefatt.ddl
diff --git a/FORTRAN/H5D/test.sh.in b/FORTRAN/H5D/test.sh.in
@@ -126,6 +126,7 @@ do
                 echo "  FAILED!"
              else
                 echo "  *Inconsequential difference* ... Passed"
+                status=0
              fi
           else
               echo "  Passed"

diff --git a/FORTRAN/H5T/CMakeLists.txt b/FORTRAN/H5T/CMakeLists.txt
@@ -177,7 +177,7 @@ if (HDF5_BUILD_TOOLS)
                     TARGET     ${EXAMPLE_VARNAME}_f90_${example_name}
                     POST_BUILD
                     COMMAND    ${CMAKE_COMMAND}
-                    ARGS       -E copy_if_different ${PROJECT_SOURCE_DIR}/tfiles/18/112/${example_name}.ddl ${example_name}.ddl
+                    ARGS       -E copy_if_different ${PROJECT_SOURCE_DIR}/tfiles/112/${example_name}.ddl ${example_name}.ddl
                 )
             else ()
               add_custom_command (

diff --git a/FORTRAN/H5T/test.sh.in b/FORTRAN/H5T/test.sh.in
@@ -140,7 +140,12 @@ do
         else
             version_compare "$H5_LIBVER" "1.12.0"
             if [ "$version_lt" = 1 ]; then
-                cmp -s tmp.test $srcdir/tfiles/110/$fname$USE_ALT.ddl
+               version_compare "$H5_LIBVER" "1.10.7"
+               if [ "$version_lt" = 1 ]; then
+                  cmp -s tmp.test $srcdir/tfiles/110/$fname$USE_ALT.ddl
+               else
+                  cmp -s tmp.test $srcdir/tfiles/18/$fname.ddl
+               fi
             else
                 cmp -s tmp.test $srcdir/tfiles/112/$fname.ddl
             fi
@@ -156,7 +161,11 @@ do
     return_val=`expr $status + $return_val`
 done
 
-topics=" vlenatt_F03 vlen_F03"
+topics=""
+version_compare "$H5_LIBVER" "1.10.0"
+if [ "$version_lt" = 0 ]; then
+  topics=" vlenatt_F03 vlen_F03"
+fi
 
 for topic in $topics
 do

diff --git a/FORTRAN/H5T/tfiles/18/112/h5ex_t_objref_F03.ddl b/FORTRAN/H5T/tfiles/18/112/h5ex_t_objref_F03.ddl
diff --git a/FORTRAN/H5T/tfiles/18/112/h5ex_t_objrefatt_F03.ddl b/FORTRAN/H5T/tfiles/18/112/h5ex_t_objrefatt_F03.ddl
diff --git a/FORTRAN/H5T/tfiles/18/112/h5ex_t_regref_F03.ddl b/FORTRAN/H5T/tfiles/18/112/h5ex_t_regref_F03.ddl
diff --git a/FORTRAN/H5T/tfiles/18/112/h5ex_t_regrefatt_F03.ddl b/FORTRAN/H5T/tfiles/18/112/h5ex_t_regrefatt_F03.ddl