[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, 33 insertions, 14 deletions

diff --git a/fortran/test/fflush2.f90 b/fortran/test/fflush2.f90
index d7e5053..41b94cb 100644
--- a/fortran/test/fflush2.f90
+++ b/fortran/test/fflush2.f90
@@ -1,9 +1,24 @@
- !
- ! Purpose:	This is the second half of a two-part test that makes sure
- !		that a file can be read after an application crashes as long
- !		as the file was flushed first.  This half tries to read the
- !		file created by the first half.
- !
+
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+!   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. *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+!
+!
+! Purpose:	This is the second half of a two-part test that makes sure
+!		that a file can be read after an application crashes as long
+!		as the file was flushed first.  This half tries to read the
+!		file created by the first half.
+!
 
      PROGRAM FFLUSH2EXAMPLE
 
@@ -11,10 +26,8 @@
         
      IMPLICIT NONE
 
-     !
-     !the respective filename is "fflush1.h5" 
-     !
-     CHARACTER(LEN=10), PARAMETER :: filename = "fflush1.h5"
+     CHARACTER(LEN=7), PARAMETER :: filename = "fflush1"
+     CHARACTER(LEN=80) :: fix_filename
 
      !
      !data space rank and dimensions
@@ -75,12 +88,17 @@
      !Initialize FORTRAN predifined datatypes
      !
      CALL h5open_f(error) 
-          CALL check("h5init_types_f",error,total_error)
+          CALL check("h5open_f",error,total_error)
 
      !
      !Open the file.
      !
-     CALL h5fopen_f(filename, H5F_ACC_RDONLY_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 h5fopen_f(fix_filename, H5F_ACC_RDONLY_F, file_id, error)
           CALL check("h5fopen_f",error,total_error)
 
      !
@@ -154,8 +172,9 @@
 
      !
      !Close FORTRAN predifined datatypes
-     !
+      !
+     CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
      CALL h5close_f(error)
          CALL check("h5close_types_f",error,total_error)
-
+     
      END PROGRAM FFLUSH2EXAMPLE