diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2017-04-05 14:41:32 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2017-04-05 14:41:32 (GMT) |
| commit | 857f515325ea0dce07a0059f735d97c39836e5de (patch) | |
| tree | 7395dba36c5b4f9cfbfb7e6d6a5ce9c21c01af8f /test | |
| parent | 48687ab50fff2f21a7f7dd3fe746377819cae8b7 (diff) | |
| parent | 60bb3fd1108e2006a79b008d031a0f68a1e6b393 (diff) | |
| download | hdf5-857f515325ea0dce07a0059f735d97c39836e5de.zip hdf5-857f515325ea0dce07a0059f735d97c39836e5de.tar.gz hdf5-857f515325ea0dce07a0059f735d97c39836e5de.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '60bb3fd1108e2006a79b008d031a0f68a1e6b393':
Re-enabled fixed array index testing in the test_random_rank4_vl() test in test/set_extent. This was fixed some time ago, but the test was never re-enabled for that index type.
Diffstat (limited to 'test')
| -rw-r--r-- | test/set_extent.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/test/set_extent.c b/test/set_extent.c index 17dc6a0..949120b 100644 --- a/test/set_extent.c +++ b/test/set_extent.c @@ -2603,10 +2603,12 @@ static int test_random_rank4( hid_t fapl, hid_t dcpl, hbool_t do_fillvalue, volatile unsigned i, j, k, l, m; /* Local indices */ char filename[NAME_BUF_SIZE]; - /*!FIXME Skip the test if a fixed array index is requested, as resizing - * fixed arrays is broken now. Extensible arrays are also broken. Remove - * these lines as appropriate when these problems are fixed. */ - /* Fixed Array index type is now fixed */ + /* *** FIXME *** + * Skip the test if an extensible array index is requested, as resizing + * them is broken. + * + * Remove these lines as appropriate when these problems are fixed. + */ if(index_type == RANK4_INDEX_EARRAY) return 0; @@ -2814,10 +2816,13 @@ static int test_random_rank4_vl( hid_t fapl, hid_t dcpl, hbool_t do_fillvalue, volatile unsigned i, j, k, l, m; /* Local indices */ char filename[NAME_BUF_SIZE]; - /*!FIXME Skip the test if a fixed array index is requested, as resizing - * fixed arrays is broken now. Extensible arrays are also broken. Remove - * these lines as appropriate when these problems are fixed. */ - if(index_type == RANK4_INDEX_FARRAY || index_type == RANK4_INDEX_EARRAY) + /* *** FIXME *** + * Skip the test if an extensible array index is requested, as resizing + * them is broken. + * + * Remove these lines as appropriate when these problems are fixed. + */ + if(index_type == RANK4_INDEX_EARRAY) return 0; /* Initialize fill value buffers so they aren't freed in case of an error */ |