[svn-r5940]

Purpose:
    Bug fix, code improvement
Description:
    Fortran tests didn't cleanup created files. Also HDF5_PREFIX and
    HDF5_PARAPREFIX were not used to specify location of the files.
    There was a redundant file in the testpar directory that contained
    an error reporting function used by both serial and parallel tests.
Solution:
    Created library h5test_fortran.a that contains functions used by the
    serial and parallel tests. It includes Fortran and C functions that
    may be called from Fortran programs to report errors, to modify
    file names and to cleanup files after run. Modified test code to
    use new functions.
Platforms tested:
    Linux 2.2 (eirene) serial
    IRIX64 (modi4) parallel with HDF5_PREFIX and HDF5_PARAPREFIX set to $SCR
    Solris 2.7 with mpich 1.2.4 with HDF5_PARAPREFIX set to /tmp/epourmal

1 files changed, 44 insertions, 36 deletions

diff --git a/fortran/test/tH5D.f90 b/fortran/test/tH5D.f90
index 1f32fbb..c808f22 100644
--- a/fortran/test/tH5D.f90
+++ b/fortran/test/tH5D.f90
@@ -1,25 +1,36 @@
+
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+!   Copyright by the Board of Trustees of the University of Illinois.         *
+!   All rights reserved.                                                      *
+!                                                                             *
+!   This file is part of HDF5.  The full HDF5 copyright notice, including     *
+!   terms governing use, modification, and redistribution, is contained in    *
+!   the files COPYING and Copyright.html.  COPYING can be found at the root   *
+!   of the source code distribution tree; Copyright.html can be found at the  *
+!   root level of an installed copy of the electronic HDF5 document set and   *
+!   is linked from the top-level documents page.  It can also be found at     *
+!   http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have     *
+!   access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+!
 !
 ! 
 !    Testing Dataset Interface functionality.
 !
-!      MODULE H5DTEST
-
-!        USE HDF5 ! This module contains all necessary modules 
-        
-!      CONTAINS
-      
 !
-!The following subroutine tests the following functionalities:
-!h5dcreate_f, h5dopen_f, h5dclose_f, h5dget_space_f, h5dget_type_f,
-!h5dread_f, and h5dwrite_f
+!    The following subroutine tests the following functionalities:
+!    h5dcreate_f, h5dopen_f, h5dclose_f, h5dget_space_f, h5dget_type_f,
+!    h5dread_f, and h5dwrite_f
 !
-        SUBROUTINE datasettest(total_error)
+        SUBROUTINE datasettest(cleanup, total_error)
         USE HDF5 ! This module contains all necessary modules 
 
           IMPLICIT NONE
+          LOGICAL, INTENT(IN) :: cleanup
           INTEGER, INTENT(OUT) :: total_error 
 
-          CHARACTER(LEN=8), PARAMETER :: filename = "dsetf.h5" ! File name
+          CHARACTER(LEN=5), PARAMETER :: filename = "dsetf" ! File name
+          CHARACTER(LEN=80) :: fix_filename 
           CHARACTER(LEN=4), PARAMETER :: dsetname = "dset"     ! Dataset name
 
           INTEGER(HID_T) :: file_id       ! File identifier 
@@ -47,16 +58,16 @@
              end do
           end do
 
-          !
-          ! Initialize FORTRAN predefined datatypes.
-          !
-!          CALL h5init_types_f(error)
-!              CALL check("h5init_types_f", error, total_error)
 
           !
           ! Create a new file using default properties.
           ! 
-          CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error)
+          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
+          if (error .ne. 0) then
+              write(*,*) "Cannot modify filename"
+              stop
+          endif
+          CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
               CALL check("h5fcreate_f", error, total_error)
 
 
@@ -104,7 +115,7 @@
           !
           ! Open the existing file.
           !
-          CALL h5fopen_f (filename, H5F_ACC_RDWR_F, file_id, error)
+          CALL h5fopen_f (fix_filename, H5F_ACC_RDWR_F, file_id, error)
               CALL check("h5fopen_f", error, total_error)
 
           !
@@ -165,13 +176,9 @@
           !
           CALL h5fclose_f(file_id, error)
               CALL check("h5fclose_f", error, total_error)
+          if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+              CALL check("h5_cleanup_f", error, total_error)
      
-         !
-         !Close FORTRAN predifined datatypes
-         !
-!         CALL h5close_types_f(error)
-!              CALL check("h5close_types_f",error,total_error)
-
           RETURN
         END SUBROUTINE datasettest
 
@@ -179,16 +186,18 @@
 !the following subroutine tests h5dextend_f functionality
 !
 
-        SUBROUTINE extenddsettest(total_error)
+        SUBROUTINE extenddsettest(cleanup, total_error)
         USE HDF5 ! This module contains all necessary modules 
 
           IMPLICIT NONE
+          LOGICAL, INTENT(IN)  :: cleanup
           INTEGER, INTENT(OUT) :: total_error 
 
           !
           !the dataset is stored in file "extf.h5"
           !
-          CHARACTER(LEN=7), PARAMETER :: filename = "extf.h5"
+          CHARACTER(LEN=4), PARAMETER :: filename = "extf"
+          CHARACTER(LEN=80) :: fix_filename
 
           !
           !dataset name is "ExtendibleArray"
@@ -266,7 +275,12 @@
           !
           !Create a new file using default properties.
           ! 
-          CALL h5fcreate_f(filename, H5F_ACC_TRUNC_F, file_id, error)
+          CALL h5_fixname_f(filename, fix_filename, H5P_DEFAULT_F, error)
+          if (error .ne. 0) then
+              write(*,*) "Cannot modify filename"
+              stop
+          endif
+          CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
                CALL check("h5fcreate_f",error,total_error)
 
 
@@ -347,7 +361,7 @@
           !
           !Open the file.
           !
-          CALL h5fopen_f (filename, H5F_ACC_RDONLY_F, file_id, error)
+          CALL h5fopen_f (fix_filename, H5F_ACC_RDONLY_F, file_id, error)
               CALL check("hfopen_f",error,total_error)
 
           !
@@ -444,16 +458,10 @@
           !
           CALL h5fclose_f(file_id, error)
               CALL check("h5fclose_f",error,total_error)
-
-          !
-          ! Close FORTRAN predefined datatypes.
-          !
-!          CALL h5close_types_f(error)
-!              CALL check("h5close_types_f",error,total_error)
+          if(cleanup) CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
+              CALL check("h5_cleanup_f", error, total_error)
 
           RETURN
         END SUBROUTINE extenddsettest 
 
 
-
-!      END MODULE H5DTEST