summaryrefslogtreecommitdiffstats
path: root/hl/fortran
diff options
context:
space:
mode:
authorVailin Choi <vchoi@hdfgroup.org>2014-11-19 00:29:26 (GMT)
committerVailin Choi <vchoi@hdfgroup.org>2014-11-19 00:29:26 (GMT)
commita00ad64f468e8ea4d19c17675258694a06febe32 (patch)
treee9213dd225503dc1806dc4b326b565567f9671ef /hl/fortran
parent5a3e6cf0800219816b018baf50b7133baa73bc68 (diff)
downloadhdf5-a00ad64f468e8ea4d19c17675258694a06febe32.zip
hdf5-a00ad64f468e8ea4d19c17675258694a06febe32.tar.gz
hdf5-a00ad64f468e8ea4d19c17675258694a06febe32.tar.bz2
[svn-r25825] Bring revisions #25509 - #25762 from trunk to revise_chunks.
h5committested.
Diffstat (limited to 'hl/fortran')
-rw-r--r--hl/fortran/src/Makefile.in4
-rw-r--r--hl/fortran/test/tsttable.f9021
2 files changed, 21 insertions, 4 deletions
diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in
index c8b6f7d..2122d72 100644
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@@ -687,8 +687,10 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog
# Add libtool shared library version numbers to the HDF5 library
# See libtool versioning documentation online.
+# After making changes, run bin/reconfigure to update other configure related
+# files like Makefile.in.
LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 182
+LT_VERS_REVISION = 193
LT_VERS_AGE = 0
# Our main target, the high-level fortran library
diff --git a/hl/fortran/test/tsttable.f90 b/hl/fortran/test/tsttable.f90
index 66ec5c6..bb88abf 100644
--- a/hl/fortran/test/tsttable.f90
+++ b/hl/fortran/test/tsttable.f90
@@ -175,13 +175,30 @@ SUBROUTINE test_table1()
CALL h5tbwrite_field_name_f(file_id,dsetname1,field_names(4),start,nrecords,type_sizer,&
bufr,errcode)
-
!-------------------------------------------------------------------------
! read field
!-------------------------------------------------------------------------
+ ! Read an invalid field, should fail
+ CALL h5tbread_field_name_f(file_id,dsetname1,'DoesNotExist',start,nrecords,type_sizec,&
+ bufsr,errcode)
+
+ IF(errcode.GE.0)THEN
+ PRINT *, 'error in h5tbread_field_name_f'
+ CALL h5fclose_f(file_id, errcode)
+ CALL h5close_f(errcode)
+ STOP
+ ENDIF
+
+ ! Read a valid field, should pass
CALL h5tbread_field_name_f(file_id,dsetname1,field_names(1),start,nrecords,type_sizec,&
bufsr,errcode)
+ IF(errcode.LT.0)THEN
+ PRINT *, 'error in h5tbread_field_name_f'
+ CALL h5fclose_f(file_id, errcode)
+ CALL h5close_f(errcode)
+ STOP
+ ENDIF
!
! compare read and write buffers.
@@ -329,8 +346,6 @@ SUBROUTINE test_table1()
! we insert a field callsed "field5" with the same type and buffer as field 4 (Real)
!-------------------------------------------------------------------------
-
-
CALL test_begin(' Insert field ')
CALL h5tbinsert_field_f(file_id,dsetname1,"field5",field_types(4),4,bufr,errcode)