summaryrefslogtreecommitdiffstats
path: root/fortran/test
diff options
context:
space:
mode:
authorScot Breitenfeld <brtnfld@hdfgroup.org>2015-03-27 22:10:24 (GMT)
committerScot Breitenfeld <brtnfld@hdfgroup.org>2015-03-27 22:10:24 (GMT)
commitd494d7b3b95cf893e6dd20688057bb13ba10422f (patch)
tree29c88f6ef8fa297609b96b08fa3bd1857b5abdd7 /fortran/test
parentb96e13a7e3476e86056a1c5424288b50001b0453 (diff)
downloadhdf5-d494d7b3b95cf893e6dd20688057bb13ba10422f.zip
hdf5-d494d7b3b95cf893e6dd20688057bb13ba10422f.tar.gz
hdf5-d494d7b3b95cf893e6dd20688057bb13ba10422f.tar.bz2
[svn-r26629] Fix for HDFFV09202 and HDFFV-9171.
HDFFV-9171 Configure mistakes Cray Compilers for Intel Compilers, HDFFV-9202 subroutine VERIFY() fails when checking 8 byte integers in fortran tests Tested: h5committest
Diffstat (limited to 'fortran/test')
-rw-r--r--fortran/test/tH5P_F03.f9011
-rw-r--r--fortran/test/tf.f9011
2 files changed, 10 insertions, 12 deletions
diff --git a/fortran/test/tH5P_F03.f90 b/fortran/test/tH5P_F03.f90
index 34fd0ad..56f9679 100644
--- a/fortran/test/tH5P_F03.f90
+++ b/fortran/test/tH5P_F03.f90
@@ -360,14 +360,13 @@ SUBROUTINE test_genprop_class_callback(total_error)
WRITE(*,*) 'Class names do not match! name=',CLASS1_NAME_BUF, 'CLASS1_NAME=',CLASS1_NAME
total_error = total_error + 1
ENDIF
-
! Close class
CALL h5pclose_class_f(cid2, error)
CALL check("h5pclose_class_f", error, total_error)
! Verify that the creation callback occurred
CALL VERIFY("h5pcreate_f", crt_cb_struct%count, 1, total_error)
- CALL VERIFY("h5pcreate_f", INT(crt_cb_struct%id), INT(lid1), total_error)
+ CALL VERIFY_INTEGER_HID_T("h5pcreate_f", crt_cb_struct%id, lid1, total_error)
! Check the number of properties in list
CALL h5pget_nprops_f(lid1,nprops, error)
@@ -380,7 +379,7 @@ SUBROUTINE test_genprop_class_callback(total_error)
! Verify that the creation callback occurred
CALL VERIFY("h5pcreate_f", crt_cb_struct%count, 2, total_error)
- CALL VERIFY("h5pcreate_f", INT(crt_cb_struct%id), INT(lid2), total_error)
+ CALL VERIFY_INTEGER_HID_T("h5pcreate_f", crt_cb_struct%id, lid2, total_error)
! Check the number of properties in list
CALL h5pget_nprops_f(lid2,nprops, error)
@@ -393,15 +392,15 @@ SUBROUTINE test_genprop_class_callback(total_error)
! Verify that the close callback occurred
CALL VERIFY("h5pcreate_f", cls_cb_struct%count, 1, total_error)
- CALL VERIFY("h5pcreate_f", INT(cls_cb_struct%id), INT(lid1), total_error)
+ CALL VERIFY_INTEGER_HID_T("h5pcreate_f", cls_cb_struct%id, lid1, total_error)
! Close second list
CALL h5pclose_f(lid2, error);
CALL check("h5pclose_f", error, total_error)
- ! Verify that the close callback occurred
+ ! Verify that the close callback occurred
CALL VERIFY("h5pcreate_f", cls_cb_struct%count, 2, total_error)
- CALL VERIFY("h5pcreate_f", INT(cls_cb_struct%id), INT(lid2), total_error)
+ CALL verify_INTEGER_HID_T("h5pcreate_f", cls_cb_struct%id, lid2, total_error)
! Close class
CALL h5pclose_class_f(cid1, error)
diff --git a/fortran/test/tf.f90 b/fortran/test/tf.f90
index 6d5911f..242d757 100644
--- a/fortran/test/tf.f90
+++ b/fortran/test/tf.f90
@@ -134,20 +134,19 @@ CONTAINS
!This definition is needed for Windows DLLs
!DEC$if defined(BUILD_HDF5_TEST_DLL)
-!DEC$attributes dllexport :: verify_Fortran_INTEGER_4
+!DEC$attributes dllexport :: verify_INTEGER_HID_T
!DEC$endif
- SUBROUTINE verify_Fortran_INTEGER_4(string,value,correct_value,total_error)
- USE HDF5
- INTEGER, PARAMETER :: int_kind_8 = SELECTED_INT_KIND(Fortran_INTEGER_4) ! should map to INTEGER*4 on most modern processors
+ SUBROUTINE verify_INTEGER_HID_T(string,value,correct_value,total_error)
+ USE HDF5
CHARACTER(LEN=*) :: string
- INTEGER(int_kind_8) :: value, correct_value
+ INTEGER(HID_T) :: value, correct_value
INTEGER :: total_error
IF (value .NE. correct_value) THEN
total_error=total_error+1
WRITE(*,*) "ERROR: INCORRECT VALIDATION ", string
ENDIF
RETURN
- END SUBROUTINE verify_Fortran_INTEGER_4
+ END SUBROUTINE verify_INTEGER_HID_T
!This definition is needed for Windows DLLs
!DEC$if defined(BUILD_HDF5_TEST_DLL)