diff options
author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2012-03-30 00:45:04 (GMT) |
---|---|---|
committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2012-03-30 00:45:04 (GMT) |
commit | d63add741b14efdf55a4bbcc6c79fcd99988ac96 (patch) | |
tree | f958f72d2a6725aeaffe548617076b765e12e923 /hl/fortran/test/tstds.f90 | |
parent | e320fb15f8ef82eede9633cd3a0bd9d1395344f2 (diff) | |
download | hdf5-d63add741b14efdf55a4bbcc6c79fcd99988ac96.zip hdf5-d63add741b14efdf55a4bbcc6c79fcd99988ac96.tar.gz hdf5-d63add741b14efdf55a4bbcc6c79fcd99988ac96.tar.bz2 |
[svn-r22206] Merged changes from the trunk in to the branch, used:
svn merge -r r22040:22205 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/hl
Tested: jam (gnu and intel compilers)
Diffstat (limited to 'hl/fortran/test/tstds.f90')
-rw-r--r-- | hl/fortran/test/tstds.f90 | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/hl/fortran/test/tstds.f90 b/hl/fortran/test/tstds.f90 index 8817989..c73e1c4 100644 --- a/hl/fortran/test/tstds.f90 +++ b/hl/fortran/test/tstds.f90 @@ -186,7 +186,10 @@ SUBROUTINE test_testds(err) name_len = 25 name = '' CALL H5DSget_scale_name_f(dsid, name, name_len, err) - IF(err.LT.0.OR.name_len.NE.21.OR.TRIM(name).NE."Dimension Scale Set 1")THEN + IF(err.LT.0 .OR. & + name_len.NE.21 .OR. & + TRIM(name).NE."Dimension Scale Set 1" .OR. & + name(22:25).NE.' ')THEN err = FAILED CALL write_test_status(err) RETURN @@ -293,7 +296,10 @@ SUBROUTINE test_testds(err) label_len = 25 label = '' CALL H5DSget_label_f(did, DIM2, label, label_len, err) - IF(err.LT.0.OR.label(1:label_len).NE."Label12".OR.label_len.NE.7)THEN + IF(err.LT.0.OR. & + label(1:label_len).NE."Label12" .OR. & + label_len.NE.7 .OR. & + label(8:25).NE.' ')THEN err = FAILED CALL write_test_status(err) RETURN |