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

diff --git a/fortran/test/tH5E.f90 b/fortran/test/tH5E.f90
index c14b101..d0e1317 100644
--- a/fortran/test/tH5E.f90
+++ b/fortran/test/tH5E.f90
@@ -1,14 +1,32 @@
-    SUBROUTINE error_report_test(total_error)
 
-!THis subroutine tests following functionalities: h5eprint_f
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+!   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. *
+! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+!
+    SUBROUTINE error_report_test(cleanup, total_error)
+
+!   This subroutine tests following functionalities: h5eprint_f
 
    USE HDF5 ! This module contains all necessary modules 
 
      IMPLICIT NONE
+     LOGICAL, INTENT(IN)  :: cleanup
      INTEGER, INTENT(OUT) :: total_error 
 
-     CHARACTER(LEN=9), PARAMETER :: filename = "etestf.h5" ! File name
-     CHARACTER(LEN=12), PARAMETER :: err_file_name = "err_file.tmp"! Error output file
+     CHARACTER(LEN=6), PARAMETER :: filename = "etestf" ! File name
+     CHARACTER(LEN=80) :: fix_filename
+     CHARACTER(LEN=8), PARAMETER :: err_filename = "err_file"! Error output file
+     CHARACTER(LEN=80)  :: fix_err_filename
           
           
 
@@ -22,7 +40,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)
      
      !
@@ -30,9 +53,14 @@
      ! Error message should go to the err_file_name file.
      !
      CALL h5gopen_f(file_id, "Doesnotexist1", grp_id, tmp_error)
-     CALL h5eprint_f(error, err_file_name)
+          CALL h5_fixname_f(err_filename, fix_err_filename, H5P_DEFAULT_F, error)
+          if (error .ne. 0) then
+              write(*,*) "Cannot modify filename"
+              stop
+          endif
+     CALL h5eprint_f(error, fix_err_filename)
      CALL h5gopen_f(file_id, "Doesnotexist2", grp_id, tmp_error)
-     CALL h5eprint_f(error, err_file_name)
+     CALL h5eprint_f(error, fix_err_filename)
     
      ! 
      ! Close the file.
@@ -40,5 +68,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)
+          if(cleanup) CALL h5_cleanup_f(err_filename, H5P_DEFAULT_F, error)
+              CALL check("h5_cleanup_f", error, total_error)
      RETURN
      END SUBROUTINE error_report_test