[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, 42 insertions, 23 deletions

diff --git a/fortran/test/tH5S.f90 b/fortran/test/tH5S.f90
index c20c445..cbdf5e6 100644
--- a/fortran/test/tH5S.f90
+++ b/fortran/test/tH5S.f90
@@ -1,29 +1,41 @@
+
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+!   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 Dataspace Interface functionality.
 !
-!      MODULE H5STEST
-
-!        USE HDF5 ! This module contains all necessary modules 
-        
-!      CONTAINS
-      
 !
-!The following subroutine tests the following functionalities:
-!h5screate_f, h5scopy_f, h5screate_simple_f, h5sis_simple_f,   
-!h5sget_simple_extent_dims_f,h5sget_simple_extent_ndims_f 
-!h5sget_simple_extent_npoints_f, h5sget_simple_extent_type_f,
-!h5sextent_copy_f, h5sset_extent_simple_f, h5sset_extent_none_f     
+!   The following subroutine tests the following functionalities:
+!   h5screate_f, h5scopy_f, h5screate_simple_f, h5sis_simple_f,   
+!   h5sget_simple_extent_dims_f,h5sget_simple_extent_ndims_f 
+!   h5sget_simple_extent_npoints_f, h5sget_simple_extent_type_f,
+!   h5sextent_copy_f, h5sset_extent_simple_f, h5sset_extent_none_f     
 !
-        SUBROUTINE dataspace_basic_test(total_error)
+        SUBROUTINE dataspace_basic_test(cleanup, total_error)
 
         USE HDF5 ! This module contains all necessary modules 
 
           IMPLICIT NONE
+          LOGICAL, INTENT(IN)  :: cleanup
           INTEGER, INTENT(OUT) :: total_error 
 
-          CHARACTER(LEN=13), PARAMETER :: filename1 = "basicspace.h5" ! File1 name
-          CHARACTER(LEN=12), PARAMETER :: filename2 = "copyspace.h5"  ! File2 name
+          CHARACTER(LEN=10), PARAMETER :: filename1 = "basicspace" ! File1 name
+          CHARACTER(LEN=9), PARAMETER :: filename2 = "copyspace"  ! File2 name
+          CHARACTER(LEN=80) :: fix_filename1 
+          CHARACTER(LEN=80) :: fix_filename2 
           CHARACTER(LEN=9), PARAMETER :: dsetname = "basicdset"       ! Dataset name
 
           INTEGER(HID_T) :: file1_id, file2_id     ! File identifiers 
@@ -73,10 +85,20 @@
           !
           ! Create new files using default properties.
           ! 
-          CALL h5fcreate_f(filename1, H5F_ACC_TRUNC_F, file1_id, error)
+          CALL h5_fixname_f(filename1, fix_filename1, H5P_DEFAULT_F, error)
+          if (error .ne. 0) then
+              write(*,*) "Cannot modify filename"
+              stop
+          endif
+          CALL h5fcreate_f(fix_filename1, H5F_ACC_TRUNC_F, file1_id, error)
               CALL check("h5fcreate_f", error, total_error)
 
-          CALL h5fcreate_f(filename2, H5F_ACC_TRUNC_F, file2_id, error)
+          CALL h5_fixname_f(filename2, fix_filename2, H5P_DEFAULT_F, error)
+          if (error .ne. 0) then
+              write(*,*) "Cannot modify filename"
+              stop
+          endif
+          CALL h5fcreate_f(fix_filename2, H5F_ACC_TRUNC_F, file2_id, error)
               CALL check("h5fcreate_f", error, total_error)
 
           ! 
@@ -243,14 +265,11 @@
           CALL h5fclose_f(file2_id, error)
               CALL check("h5fclose_f", error, total_error)
      
-         !
-         !Close FORTRAN predifined datatypes
-         !
-!         CALL h5close_types_f(error)
-!              CALL check("h5close_types_f",error,total_error)
 
+          if(cleanup) CALL h5_cleanup_f(filename1, H5P_DEFAULT_F, error)
+              CALL check("h5_cleanup_f", error, total_error)
+          if(cleanup) CALL h5_cleanup_f(filename2, H5P_DEFAULT_F, error)
+              CALL check("h5_cleanup_f", error, total_error)
           RETURN
         END SUBROUTINE dataspace_basic_test
 
-
-!      END MODULE H5STEST