summaryrefslogtreecommitdiffstats
path: root/fortran/test/tf.f90
diff options
context:
space:
mode:
authorElena Pourmal <epourmal@hdfgroup.org>2008-05-27 16:06:23 (GMT)
committerElena Pourmal <epourmal@hdfgroup.org>2008-05-27 16:06:23 (GMT)
commitf15c901b8f95648603e1d10313d0b9b3b843d6b2 (patch)
tree8c8a34234db4698766ac7ed8ee963246a8b76377 /fortran/test/tf.f90
parent887c7866935ae1b4ea261d02cbb52f381c94d389 (diff)
downloadhdf5-f15c901b8f95648603e1d10313d0b9b3b843d6b2.zip
hdf5-f15c901b8f95648603e1d10313d0b9b3b843d6b2.tar.gz
hdf5-f15c901b8f95648603e1d10313d0b9b3b843d6b2.tar.bz2
[svn-r15074] Maintenance: This check-in should fix daily tests failures:
Uninstall target had non-existant file to remove; error_handler module triggered a race condition for parallel make with Intel and PGI compilers, therefore we removed the module and created a subroutine instead. Platforms tested: kagiso with GNU, Intel and PGI compilers.
Diffstat (limited to 'fortran/test/tf.f90')
-rw-r--r--fortran/test/tf.f9021
1 files changed, 9 insertions, 12 deletions
diff --git a/fortran/test/tf.f90 b/fortran/test/tf.f90
index b69152e..2b539a4 100644
--- a/fortran/test/tf.f90
+++ b/fortran/test/tf.f90
@@ -18,17 +18,7 @@
! This file contains subroutines which are used in
! all the hdf5 fortran tests
!
-MODULE error_handler
-! Controls the output style for reporting test results
-
- CHARACTER(LEN=8) :: error_string
- CHARACTER(LEN=8), PARAMETER :: success = ' PASSED '
- CHARACTER(LEN=8), PARAMETER :: failure = '*FAILED*'
- CHARACTER(LEN=8), PARAMETER :: skip = '--SKIP--'
- CHARACTER(LEN=4), PARAMETER :: e_format ='(8a)'
-
-CONTAINS
!This definition is needed for Windows DLLs
!DEC$if defined(BUILD_HDF5_DLL)
@@ -47,6 +37,15 @@ CONTAINS
CHARACTER(LEN=*), INTENT(IN) :: test_title ! Short description of test
INTEGER, INTENT(INOUT) :: total_error ! Accumulated error
+! Controls the output style for reporting test results
+
+ CHARACTER(LEN=8) :: error_string
+ CHARACTER(LEN=8), PARAMETER :: success = ' PASSED '
+ CHARACTER(LEN=8), PARAMETER :: failure = '*FAILED*'
+ CHARACTER(LEN=8), PARAMETER :: skip = '--SKIP--'
+ CHARACTER(LEN=4), PARAMETER :: e_format ='(8a)'
+
+
error_string = failure
IF (test_result == 0) THEN
error_string = success
@@ -61,8 +60,6 @@ CONTAINS
END SUBROUTINE write_test_status
-END MODULE error_handler
-
!This definition is needed for Windows DLLs
!DEC$if defined(BUILD_HDF5_DLL)