summaryrefslogtreecommitdiffstats
path: root/fortran/test
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2015-03-30 02:32:09 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2015-03-30 02:32:09 (GMT)
commitf617eeb78fbc2df5baacc9b0af9a08920a3538d8 (patch)
treee2d34372af71b107c867afc2c699dfa8514e8155 /fortran/test
parent39fb0401a089a3c3f9e9e2105eaaa69c9a4ab8a9 (diff)
downloadhdf5-f617eeb78fbc2df5baacc9b0af9a08920a3538d8.zip
hdf5-f617eeb78fbc2df5baacc9b0af9a08920a3538d8.tar.gz
hdf5-f617eeb78fbc2df5baacc9b0af9a08920a3538d8.tar.bz2
[svn-r26645] Revert the part of revision 26642 that is in fortran/test and causes the error "undefined reference to `verify_fortran_integer_4_".
files: tH5P_F03.f90 tf.f90 Tested: h5committest and several failed daily tests.
Diffstat (limited to 'fortran/test')
-rw-r--r--fortran/test/tH5P_F03.f9011
-rw-r--r--fortran/test/tf.f9011
2 files changed, 12 insertions, 10 deletions
diff --git a/fortran/test/tH5P_F03.f90 b/fortran/test/tH5P_F03.f90
index 56f9679..34fd0ad 100644
--- a/fortran/test/tH5P_F03.f90
+++ b/fortran/test/tH5P_F03.f90
@@ -360,13 +360,14 @@ 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_INTEGER_HID_T("h5pcreate_f", crt_cb_struct%id, lid1, total_error)
+ CALL VERIFY("h5pcreate_f", INT(crt_cb_struct%id), INT(lid1), total_error)
! Check the number of properties in list
CALL h5pget_nprops_f(lid1,nprops, error)
@@ -379,7 +380,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_INTEGER_HID_T("h5pcreate_f", crt_cb_struct%id, lid2, total_error)
+ CALL VERIFY("h5pcreate_f", INT(crt_cb_struct%id), INT(lid2), total_error)
! Check the number of properties in list
CALL h5pget_nprops_f(lid2,nprops, error)
@@ -392,15 +393,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_INTEGER_HID_T("h5pcreate_f", cls_cb_struct%id, lid1, total_error)
+ CALL VERIFY("h5pcreate_f", INT(cls_cb_struct%id), INT(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_INTEGER_HID_T("h5pcreate_f", cls_cb_struct%id, lid2, total_error)
+ CALL VERIFY("h5pcreate_f", INT(cls_cb_struct%id), INT(lid2), total_error)
! Close class
CALL h5pclose_class_f(cid1, error)
diff --git a/fortran/test/tf.f90 b/fortran/test/tf.f90
index 242d757..6d5911f 100644
--- a/fortran/test/tf.f90
+++ b/fortran/test/tf.f90
@@ -134,19 +134,20 @@ CONTAINS
!This definition is needed for Windows DLLs
!DEC$if defined(BUILD_HDF5_TEST_DLL)
-!DEC$attributes dllexport :: verify_INTEGER_HID_T
+!DEC$attributes dllexport :: verify_Fortran_INTEGER_4
!DEC$endif
- SUBROUTINE verify_INTEGER_HID_T(string,value,correct_value,total_error)
- USE HDF5
+ 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
CHARACTER(LEN=*) :: string
- INTEGER(HID_T) :: value, correct_value
+ INTEGER(int_kind_8) :: 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_INTEGER_HID_T
+ END SUBROUTINE verify_Fortran_INTEGER_4
!This definition is needed for Windows DLLs
!DEC$if defined(BUILD_HDF5_TEST_DLL)