From c4cd250408c7f973c909a56c3cae18ed6a0118f2 Mon Sep 17 00:00:00 2001
From: Scot Breitenfeld <brtnfld@hdfgroup.org>
Date: Wed, 4 May 2022 18:29:49 -0500
Subject: [PATCH] changes parallel tests to .F90 ext. and fixes the CALL check
 strings (#1725)

---
 fortran/testpar/CMakeLists.txt           |  6 ++---
 fortran/testpar/Makefile.am              |  2 +-
 fortran/testpar/{hyper.f90 => hyper.F90} |  0
 fortran/testpar/{mdset.f90 => mdset.F90} | 29 ++++++++++++------------
 fortran/testpar/{ptest.f90 => ptest.F90} |  0
 5 files changed, 18 insertions(+), 19 deletions(-)
 rename fortran/testpar/{hyper.f90 => hyper.F90} (100%)
 rename fortran/testpar/{mdset.f90 => mdset.F90} (94%)
 rename fortran/testpar/{ptest.f90 => ptest.F90} (100%)

diff --git a/fortran/testpar/CMakeLists.txt b/fortran/testpar/CMakeLists.txt
index 12489528ff..c37e84c32f 100644
--- a/fortran/testpar/CMakeLists.txt
+++ b/fortran/testpar/CMakeLists.txt
@@ -17,9 +17,9 @@ endif ()
 
 #-- Adding test for parallel_test
 add_executable (parallel_test
-    ptest.f90
-    hyper.f90
-    mdset.f90
+    ptest.F90
+    hyper.F90
+    mdset.F90
 )
 target_include_directories (parallel_test
     PRIVATE ${TESTPAR_INCLUDES}
diff --git a/fortran/testpar/Makefile.am b/fortran/testpar/Makefile.am
index f4bb73fcbf..00538f4a8d 100644
--- a/fortran/testpar/Makefile.am
+++ b/fortran/testpar/Makefile.am
@@ -40,7 +40,7 @@ check_PROGRAMS=$(TEST_PROG_PARA)
 CHECK_CLEANFILES+=parf[12].h5
 
 # Test source files
-parallel_test_SOURCES=ptest.f90 hyper.f90 mdset.f90
+parallel_test_SOURCES=ptest.F90 hyper.F90 mdset.F90
 
 # The tests depend on several libraries.
 LDADD=$(LIBH5FTEST) $(LIBH5TEST) $(LIBH5F) $(LIBHDF5)
diff --git a/fortran/testpar/hyper.f90 b/fortran/testpar/hyper.F90
similarity index 100%
rename from fortran/testpar/hyper.f90
rename to fortran/testpar/hyper.F90
diff --git a/fortran/testpar/mdset.f90 b/fortran/testpar/mdset.F90
similarity index 94%
rename from fortran/testpar/mdset.f90
rename to fortran/testpar/mdset.F90
index 22b7a6c4e2..9aa7b9ef90 100644
--- a/fortran/testpar/mdset.f90
+++ b/fortran/testpar/mdset.F90
@@ -218,30 +218,30 @@ SUBROUTINE multiple_dset_write(length, do_collective, do_chunk, mpi_size, mpi_ra
   CALL check("h5pcreate_f", hdferror, nerrors)
 
   CALL h5pset_fapl_mpio_f(fapl_id, MPI_COMM_WORLD, MPI_INFO_NULL, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
+  CALL check("h5pset_fapl_mpio_f", hdferror, nerrors)
 
   CALL h5fopen_f(filename, H5F_ACC_RDWR_F, file_id, hdferror, access_prp = fapl_id)
-  CALL check("h5pcreate_f", hdferror, nerrors)
+  CALL check("h5fopen_f", hdferror, nerrors)
 
   CALL h5screate_simple_f(1, dims, fspace_id, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
+  CALL check("h5screate_simple_f", hdferror, nerrors)
 
   CALL h5screate_simple_f(1, dims, mspace_id, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
+  CALL check("h5screate_simple_f", hdferror, nerrors)
 
   !//////////////////////////////////////////////////////////
   ! select hyperslab in memory
   !//////////////////////////////////////////////////////////
 
   CALL h5sselect_hyperslab_f(mspace_id, H5S_SELECT_SET_F, start, counti, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
+  CALL check("h5sselect_hyperslab_f", hdferror, nerrors)
 
   !//////////////////////////////////////////////////////////
   ! select hyperslab in the file
   !//////////////////////////////////////////////////////////
 
   CALL h5sselect_hyperslab_f(fspace_id, H5S_SELECT_SET_F, start, counti, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
+  CALL check("h5sselect_hyperslab_f", hdferror, nerrors)
 
   !//////////////////////////////////////////////////////////
   ! create a property list for collective dataset read
@@ -252,7 +252,7 @@ SUBROUTINE multiple_dset_write(length, do_collective, do_chunk, mpi_size, mpi_ra
 
   IF (do_collective) THEN
      CALL h5pset_dxpl_mpio_f(dxpl_id, H5FD_MPIO_COLLECTIVE_F, hdferror)
-     CALL check("h5pcreate_f", hdferror, nerrors)
+     CALL check("h5pset_dxpl_mpio_f", hdferror, nerrors)
   ENDIF
 
   !//////////////////////////////////////////////////////////
@@ -266,11 +266,11 @@ SUBROUTINE multiple_dset_write(length, do_collective, do_chunk, mpi_size, mpi_ra
 
      ! create this dataset
      CALL h5dopen_f(file_id, dsetname, dset_id, hdferror)
-     CALL check("h5pcreate_f", hdferror, nerrors)
+     CALL check("h5dopen_f", hdferror, nerrors)
 
      ! read this dataset
      CALL h5dread_f(dset_id,H5T_NATIVE_INTEGER,rbuf,dims,hdferror,file_space_id=fspace_id,mem_space_id=mspace_id,xfer_prp=dxpl_id)
-     CALL check("h5pcreate_f", hdferror, nerrors)
+     CALL check("h5dread_f", hdferror, nerrors)
 
      ! close this dataset
      CALL h5dclose_f(dset_id, hdferror)
@@ -296,20 +296,19 @@ SUBROUTINE multiple_dset_write(length, do_collective, do_chunk, mpi_size, mpi_ra
   !//////////////////////////////////////////////////////////
 
   CALL h5pclose_f(fapl_id, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
+  CALL check("h5pclose_f", hdferror, nerrors)
 
   CALL h5pclose_f(dxpl_id, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
+  CALL check("h5pclose_f", hdferror, nerrors)
 
   CALL h5sclose_f(fspace_id, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
+  CALL check("h5sclose_f", hdferror, nerrors)
 
   CALL h5sclose_f(mspace_id, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
+  CALL check("h5sclose_f", hdferror, nerrors)
 
   CALL h5fclose_f(file_id, hdferror)
-  CALL check("h5pcreate_f", hdferror, nerrors)
-
+  CALL check("h5fclose_f", hdferror, nerrors)
 
   DEALLOCATE(wbuf)
   DEALLOCATE(rbuf)
diff --git a/fortran/testpar/ptest.f90 b/fortran/testpar/ptest.F90
similarity index 100%
rename from fortran/testpar/ptest.f90
rename to fortran/testpar/ptest.F90