summaryrefslogtreecommitdiffstats
path: root/fortran
diff options
context:
space:
mode:
authorScot Breitenfeld <brtnfld@hdfgroup.org>2011-10-31 14:43:09 (GMT)
committerScot Breitenfeld <brtnfld@hdfgroup.org>2011-10-31 14:43:09 (GMT)
commitfdade1b4c497703df42ed588b4016b1ed049f048 (patch)
tree58cb534d5bbfddba09ee87dbc466b3e4568e412e /fortran
parentdec578ae2aa813df601c209bc14e2129e441527b (diff)
downloadhdf5-fdade1b4c497703df42ed588b4016b1ed049f048.zip
hdf5-fdade1b4c497703df42ed588b4016b1ed049f048.tar.gz
hdf5-fdade1b4c497703df42ed588b4016b1ed049f048.tar.bz2
[svn-r21693] Brought r21691,r21690 to the branch, which:
Removed not needed test in fortranlib_test_F03.f90 and made fortranlib_test_1_8.f90 standard compliant. tested: jam (gnu compiler)
Diffstat (limited to 'fortran')
-rw-r--r--fortran/test/fortranlib_test_1_8.f904
-rw-r--r--fortran/test/fortranlib_test_F03.f908
2 files changed, 2 insertions, 10 deletions
diff --git a/fortran/test/fortranlib_test_1_8.f90 b/fortran/test/fortranlib_test_1_8.f90
index dbada6b..321cb99 100644
--- a/fortran/test/fortranlib_test_1_8.f90
+++ b/fortran/test/fortranlib_test_1_8.f90
@@ -614,7 +614,7 @@ SUBROUTINE test_scaleoffset(cleanup, total_error )
CALL CHECK(" H5Pset_scaleoffset_f", error, total_error)
! Create the dataset
- CALL H5Dcreate_f(file, "scaleoffset_int", datatype, &
+ CALL H5Dcreate_f(file, "scaleoffset_int", datatype, &
space, dataset, error, dc)
CALL CHECK(" H5Dcreate_f", error, total_error)
@@ -639,7 +639,7 @@ SUBROUTINE test_scaleoffset(cleanup, total_error )
DO j = 1, dims(2)
CALL RANDOM_NUMBER(x)
orig_data(1,j) = INT(x*10000.)
- IF(MOD(j,2).EQ.0)THEN
+ IF(MOD(j,2_size_t).EQ.0)THEN
orig_data(1,j) = - orig_data(1,j)
ENDIF
ENDDO
diff --git a/fortran/test/fortranlib_test_F03.f90 b/fortran/test/fortranlib_test_F03.f90
index 96c7274..8ebee82 100644
--- a/fortran/test/fortranlib_test_F03.f90
+++ b/fortran/test/fortranlib_test_F03.f90
@@ -116,14 +116,6 @@ PROGRAM fortranlibtest_F03
CALL write_test_status(ret_total_error, &
' Testing filling functions', &
total_error)
-!DEC$ if defined(H5_VMS)
- GOTO 8
-!DEC$ else
- ret_total_error = 0
- CALL file_close(cleanup, ret_total_error)
- CALL write_test_status(ret_total_error, ' File open/close test', total_error)
-!DEC$ endif
-8 CONTINUE
ret_total_error = 0
CALL test_h5kind_to_type(total_error)