[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, 8 deletions

diff --git a/fortran/test/tH5A.f90 b/fortran/test/tH5A.f90
index cec25de..7f984e5 100644
--- a/fortran/test/tH5A.f90
+++ b/fortran/test/tH5A.f90
@@ -1,17 +1,33 @@
 
-    SUBROUTINE attribute_test(total_error)
-
-!THis subroutine tests following functionalities: 
-!h5acreate_f,  h5awrite_f, h5aclose_f,h5aread_f, h5aopen_name_f,
-!h5aget_name_f,h5aget_space_f, h5aget_type_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 attribute_test(cleanup, total_error)
+
+!   This subroutine tests following functionalities: 
+!   h5acreate_f,  h5awrite_f, h5aclose_f,h5aread_f, h5aopen_name_f,
+!   h5aget_name_f,h5aget_space_f, h5aget_type_f,
 ! 
 
      USE HDF5 ! This module contains all necessary modules 
         
      IMPLICIT NONE
+     LOGICAL, INTENT(IN)  :: cleanup
      INTEGER, INTENT(OUT) :: total_error 
 
-     CHARACTER(LEN=8), PARAMETER :: filename = "atest.h5"    !File name
+     CHARACTER(LEN=5), PARAMETER :: filename = "atest.h5"    !File name
+     CHARACTER(LEN=80) :: fix_filename 
      CHARACTER(LEN=9), PARAMETER :: dsetname = "atestdset"        !Dataset name
      CHARACTER(LEN=11), PARAMETER :: aname = "attr_string"   !String Attribute name
      CHARACTER(LEN=14), PARAMETER :: aname2 = "attr_character"!Character Attribute name
@@ -114,7 +130,12 @@
      !
      ! Create the file.
      !
-     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 file name"
+              stop
+          endif
+     CALL h5fcreate_f(fix_filename, H5F_ACC_TRUNC_F, file_id, error)
      CALL check("h5fcreate_f",error,total_error)
 
      !
@@ -291,7 +312,7 @@
      !
      ! Open 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("h5open_f",error,total_error)
      !
      ! Reopen dataset
@@ -507,6 +528,10 @@
      !
      CALL h5fclose_f(file_id, error)
      CALL check("h5fclose_f",error,total_error)
+     !
+     ! Remove the file
+     !
+     if (cleanup) call h5_cleanup_f(filename, H5P_DEFAULT_F, error)
 
      RETURN
      END SUBROUTINE attribute_test