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

diff --git a/fortran/test/tH5P.f90 b/fortran/test/tH5P.f90
index 0567b21..440f814 100644
--- a/fortran/test/tH5P.f90
+++ b/fortran/test/tH5P.f90
@@ -1,15 +1,32 @@
      
-    SUBROUTINE external_test(total_error)
-!THis subroutine tests following functionalities: 
-!h5pset_external_f,  h5pget_external_count_f,
-!h5pget_external_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 external_test(cleanup, total_error)
+
+!   This subroutine tests following functionalities: 
+!   h5pset_external_f,  h5pget_external_count_f,
+!   h5pget_external_f
 
      USE HDF5 ! This module contains all necessary modules 
         
      IMPLICIT NONE
+     LOGICAL, INTENT(IN)  :: cleanup
      INTEGER, INTENT(OUT) :: total_error 
 
-     CHARACTER(LEN=11), PARAMETER :: filename = "external.h5"
+     CHARACTER(LEN=8), PARAMETER :: filename = "external"
+     CHARACTER(LEN=80) :: fix_filename
      INTEGER(HID_T) :: file_id     
      INTEGER(HID_T) :: plist_id     
      INTEGER(HID_T) :: space_id     
@@ -28,16 +45,16 @@
                       !specified dataset
      INTEGER(SIZE_T) :: namesize
 
-     !
-     !  Initialize FORTRAN predefined datatypes
-     !
-!     CALL h5init_types_f(error)
-!     CALL check("h5init_types_f",error,total_error)
 
      !
      !Create file "external.h5" 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)
 
      CALL h5pcreate_f(H5P_DATASET_CREATE_F, plist_id, error)
@@ -93,9 +110,9 @@
      CALL h5fclose_f(file_id, error)
      CALL check("h5fclose_f", error, total_error)
 
-!     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 external_test