diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2009-07-22 15:25:03 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2009-07-22 15:25:03 (GMT) |
| commit | 2bb5d04019767c4bb3e750111e83cdddc0b30fa4 (patch) | |
| tree | 297dcddf85829f2d751bc87f9105fb014094a3a8 | |
| parent | 0f9fd0af2dadc3256f1e54540b8904e1bcfd67d2 (diff) | |
| download | hdf5-2bb5d04019767c4bb3e750111e83cdddc0b30fa4.zip hdf5-2bb5d04019767c4bb3e750111e83cdddc0b30fa4.tar.gz hdf5-2bb5d04019767c4bb3e750111e83cdddc0b30fa4.tar.bz2 | |
[svn-r17222] Description:
Added filename argument to file_space routine to avoid conflicts of the files when running fortranlib_test_1_8.f90 and fortranlib_test.f90 at the same time (i.e. when running the tests in parallel).
tested: smirom (ifort, pgf90, g95, gfortran), linew
| -rw-r--r-- | fortran/test/fortranlib_test.f90 | 2 | ||||
| -rw-r--r-- | fortran/test/fortranlib_test_1_8.f90 | 2 | ||||
| -rw-r--r-- | fortran/test/tH5F.f90 | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/fortran/test/fortranlib_test.f90 b/fortran/test/fortranlib_test.f90 index 742e98b..f44e373 100644 --- a/fortran/test/fortranlib_test.f90 +++ b/fortran/test/fortranlib_test.f90 @@ -75,7 +75,7 @@ PROGRAM fortranlibtest 8 CONTINUE ret_total_error = 0 - CALL file_space(cleanup, ret_total_error) + CALL file_space("file_space",cleanup, ret_total_error) CALL write_test_status(ret_total_error, ' File free space test', total_error) ! write(*,*) diff --git a/fortran/test/fortranlib_test_1_8.f90 b/fortran/test/fortranlib_test_1_8.f90 index 6158c16..9ab6743 100644 --- a/fortran/test/fortranlib_test_1_8.f90 +++ b/fortran/test/fortranlib_test_1_8.f90 @@ -51,7 +51,7 @@ PROGRAM fortranlibtest WRITE(*,*) ret_total_error = 0 - CALL file_space(cleanup, ret_total_error) + CALL file_space("file_space_1_8",cleanup, ret_total_error) CALL write_test_status(ret_total_error, & ' Testing file free space', & total_error) diff --git a/fortran/test/tH5F.f90 b/fortran/test/tH5F.f90 index e39d0ee..af2d7d6 100644 --- a/fortran/test/tH5F.f90 +++ b/fortran/test/tH5F.f90 @@ -691,15 +691,14 @@ ! The following subroutine tests h5fget_freespace_f ! - SUBROUTINE file_space(cleanup, total_error) + SUBROUTINE file_space(filename, cleanup, total_error) USE HDF5 ! This module contains all necessary modules IMPLICIT NONE + CHARACTER(*), INTENT(IN) :: filename LOGICAL, INTENT(IN) :: cleanup INTEGER, INTENT(OUT) :: total_error INTEGER :: error - ! - CHARACTER(LEN=10), PARAMETER :: filename = "file_space" CHARACTER(LEN=3), PARAMETER :: grpname = "grp" CHARACTER(LEN=80) :: fix_filename |