diff options
author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2014-01-27 22:13:23 (GMT) |
---|---|---|
committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2014-01-27 22:13:23 (GMT) |
commit | dcde3e4cdf751d564e17dceb2d55bf20bc4ba68e (patch) | |
tree | 6ab85c0bdb5105585d589c77359db822ba7409f8 /fortran/test | |
parent | 3ffdf81de41c8a3ebf79a6c593407a8f98dd1b01 (diff) | |
download | hdf5-dcde3e4cdf751d564e17dceb2d55bf20bc4ba68e.zip hdf5-dcde3e4cdf751d564e17dceb2d55bf20bc4ba68e.tar.gz hdf5-dcde3e4cdf751d564e17dceb2d55bf20bc4ba68e.tar.bz2 |
[svn-r24651] Merged changes in the fortran directory from the trunk into the branch,
svn merge -r23351:24650 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran .
Tested: jam (gcc, intel), koala (gcc)
Diffstat (limited to 'fortran/test')
-rw-r--r-- | fortran/test/Makefile.in | 1 | ||||
-rw-r--r-- | fortran/test/tH5F_F03.f90 | 8 | ||||
-rw-r--r-- | fortran/test/tH5O.f90 | 2 | ||||
-rw-r--r-- | fortran/test/tH5T_F03.f90 | 13 |
4 files changed, 13 insertions, 11 deletions
diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index 6c226bc..9f8b6d0 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -333,6 +333,7 @@ LIPO = @LIPO@ LL_PATH = @LL_PATH@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_ADD_LIBHDF5_DEPENDENCY = @LT_ADD_LIBHDF5_DEPENDENCY@ LT_STATIC_EXEC = @LT_STATIC_EXEC@ MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ diff --git a/fortran/test/tH5F_F03.f90 b/fortran/test/tH5F_F03.f90 index dea9a5d..79b0458 100644 --- a/fortran/test/tH5F_F03.f90 +++ b/fortran/test/tH5F_F03.f90 @@ -62,10 +62,6 @@ SUBROUTINE test_get_file_image(total_error) INTEGER(hid_t) :: fapl ! File access property INTEGER :: error ! Error flag - - RETURN ! DEBUG, PGI COMPILERS seem to have a bug in the INQUIRE functions, - ! waiting for an answer from PGI how to resolve the problem. - ! Create new properties for file access CALL h5pcreate_f(H5P_FILE_ACCESS_F, fapl, error) CALL check("h5pcreate_f", error, total_error) @@ -151,9 +147,9 @@ SUBROUTINE test_get_file_image(total_error) ALLOCATE(file_image_ptr(1:image_size)) ! Open the test file using standard I/O calls - OPEN(UNIT=10,FILE='tget_file_image.h5', ACCESS='STREAM') + OPEN(UNIT=10,FILE='tget_file_image.h5', FORM='UNFORMATTED', ACCESS='STREAM') - ! Read the test file from disk into the buffer + ! Read the test file from disk into the buffer DO i = 1, image_size READ(10) file_image_ptr(i) ENDDO diff --git a/fortran/test/tH5O.f90 b/fortran/test/tH5O.f90 index b68e7ca..ea91631 100644 --- a/fortran/test/tH5O.f90 +++ b/fortran/test/tH5O.f90 @@ -535,7 +535,7 @@ SUBROUTINE test_h5o_link(total_error) ! close the datatype CALL h5tclose_f(tid, error) - CALL check("h5tclose_f",error) + CALL check("h5tclose_f",error, total_error) CALL h5ocopy_f(file_id, NAME_DATATYPE_SIMPLE, file_id, NAME_DATATYPE_SIMPLE2, error) CALL check("h5ocopy_f",error,total_error) diff --git a/fortran/test/tH5T_F03.f90 b/fortran/test/tH5T_F03.f90 index f7efcc4..a9a6487 100644 --- a/fortran/test/tH5T_F03.f90 +++ b/fortran/test/tH5T_F03.f90 @@ -3137,10 +3137,15 @@ SUBROUTINE t_enum_conv(total_error) ! Enumerated data array ! Some values are out of range for testing. The library should accept them - INTEGER(KIND(E1_RED)), DIMENSION(1:20), TARGET :: data1 = (/E1_RED, E1_GREEN, E1_BLUE, E1_GREEN, E1_WHITE,& - E1_WHITE, E1_BLACK, E1_GREEN, E1_BLUE, E1_RED,& - E1_RED, E1_BLUE, E1_GREEN, E1_BLACK, E1_WHITE,& - E1_RED, E1_WHITE, INT(0,KIND(E1_RED)), INT(-1,KIND(E1_RED)), INT(-2,KIND(E1_RED))/) + INTEGER(KIND(E1_RED)), DIMENSION(1:20), TARGET :: data1 = (/INT(E1_RED,KIND(E1_RED)), & + INT(E1_GREEN,KIND(E1_RED)), INT(E1_BLUE,KIND(E1_RED)), & + INT(E1_GREEN,KIND(E1_RED)), INT(E1_WHITE,KIND(E1_RED)), & + INT(E1_WHITE,KIND(E1_RED)), INT(E1_BLACK,KIND(E1_RED)), & + INT(E1_GREEN,KIND(E1_RED)), INT(E1_BLUE,KIND(E1_RED)), & + INT(E1_RED,KIND(E1_RED)), INT(E1_RED,KIND(E1_RED)), INT(E1_BLUE,KIND(E1_RED)), & + INT(E1_GREEN,KIND(E1_RED)), INT(E1_BLACK,KIND(E1_RED)), INT(E1_WHITE,KIND(E1_RED)),& + INT(E1_RED,KIND(E1_RED)), INT(E1_WHITE,KIND(E1_RED)), & + INT(0,KIND(E1_RED)), INT(-1,KIND(E1_RED)), INT(-2,KIND(E1_RED))/) ! Reading array for enum data INTEGER(KIND(E1_RED)), DIMENSION(1:20), TARGET :: data2 |