summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2017-04-05 02:52:27 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2017-04-05 02:52:27 (GMT)
commit60bb3fd1108e2006a79b008d031a0f68a1e6b393 (patch)
tree8aed64c6690193beb43c2ab30baa497dc054778d
parentd522632b9e1f1d88db2117e89f3caba0dc4cf38b (diff)
parentf060e05999849c1eb3ef653c08977e4b154749d8 (diff)
downloadhdf5-60bb3fd1108e2006a79b008d031a0f68a1e6b393.zip
hdf5-60bb3fd1108e2006a79b008d031a0f68a1e6b393.tar.gz
hdf5-60bb3fd1108e2006a79b008d031a0f68a1e6b393.tar.bz2
Merge pull request #393 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop
* commit 'f060e05999849c1eb3ef653c08977e4b154749d8': 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.
-rw-r--r--test/set_extent.c21
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 */