Fix for HDFFV-10166 h5watch tests fail randomly to match expected output files

(1) Re-structure tests to do one "extend" action at a time
(2) Re-try test till max limit before final failure

1 files changed, 134 insertions, 173 deletions

diff --git a/hl/tools/h5watch/extend_dset.c b/hl/tools/h5watch/extend_dset.c
index f6b4161..ab086f6 100644
--- a/hl/tools/h5watch/extend_dset.c
+++ b/hl/tools/h5watch/extend_dset.c
@@ -34,27 +34,8 @@
 /* Size of data buffer */
 #define TEST_BUF_SIZE 100
 
-/*
- * Test variations (incremental) for one-dimensional dataset:
- *     Varies from 10->13->12->12->1->3
- */
-#define ONE_NTESTS    5
-int one_tests[ONE_NTESTS] = {3, -1, 0, -11, 2};
-
-/*
- * Test variations (incremental) for two-dimensional dataset:
- *    Varies from {4,10}->{6,12}->{8,1}->{10,1}->
- *                             {3,3}->{2,2}->{1,2}->
- *                    {1,4}->{1,3}->{1,3}
- */
-#define TWO_NTESTS  9
-int two_tests[TWO_NTESTS][2] = { {2, 2}, {2, -11}, {2, 0},
-                                 {-7, 2}, {-1, -1}, {-1, 0},
-                                 {0, 2}, {0, -1}, {0, 0}
-                };
-
-static herr_t extend_dset_two(const char *file, char *dname);
-static herr_t extend_dset_one(const char *file, char *dname);
+static herr_t extend_dset_two(const char *file, char *dname, int action1, int action2);
+static herr_t extend_dset_one(const char *file, char *dname, int action);
 
 
 /* Data structures for datasets with compound data type */
@@ -85,29 +66,13 @@ typedef struct set_t {
 /*
  ***********************************************************************
  *
- * Extending a two-dimensional dataset:
- *              dims[0]         dims[1]
- *                      -------         -------
- *      case #1:        increase        increase
- *      case #2:        increase        decrease
- *      case #3:        increase        same
- *      case #4:        decrease        increase
- *      case #5:        decrease        decrease        (no action)
- *      case #6:        decrease        same            (no action)
- *      case #7:        same            increase
- *      case #8:        same            decrease        (no action)
- *      case #9:        same            same            (no action)
- *
- *    two_tests[TWO_NTESTS][2] = { {2,2}, {2,-11}, {2,0},
- *                                   {-7,2}, {-1,-1}, {-1,0},
- *                                   {0,2}, {0,-1}, {0,0} }
- *    varies from {4,10}->{6,12}->{8,1}->{10,1}->
- *                             {3,3}->{2,2}->{1,2}->
- *                    {1,4}->{1,3}->{1,3}
+ * Extending a two-dimensional dataset by action1 and action2.
+ *        --action1 and action2 can be a positive # or negative # or 0.
+ *  
  ***********************************************************************
  */
 static herr_t
-extend_dset_two(const char *file, char *dname)
+extend_dset_two(const char *file, char *dname, int action1, int action2)
 {
     hid_t fid = -1;         /* file id                                          */
     hid_t fapl = -1;        /* file access property list id                     */
@@ -165,61 +130,57 @@ extend_dset_two(const char *file, char *dname)
     if(h5_wait_message(READER_MESSAGE) < 0)
         goto error;
 
-    /* Loop through different variations of extending the dataset */
-    for(i = 0; i < TWO_NTESTS; i++) {
+    /* sleep to emulate about 2 seconds of application operation */
+    HDsleep(2);
 
-        /* sleep to emulate about 2 seconds of application operation */
-        HDsleep(2);
+    /* Get current dimension sizes */
+    if(H5LDget_dset_dims(did, cur_dims) < 0)
+        goto error;
 
-        /* Get current dimension sizes */
-        if(H5LDget_dset_dims(did, cur_dims) < 0)
-            goto error;
+    /* Set up the new extended dimension sizes  */
+    ext_dims[0] = cur_dims[0] + (hsize_t)action1;
+    ext_dims[1] = cur_dims[1] + (hsize_t)action2;
 
-        /* Set up the new extended dimension sizes  */
-        ext_dims[0] = cur_dims[0] + (hsize_t)two_tests[i][0];
-        ext_dims[1] = cur_dims[1] + (hsize_t)two_tests[i][1];
+    /* Extend the dataset */
+    if(H5Dset_extent(did, ext_dims) < 0)
+        goto error;
 
-        /* Extend the dataset */
-        if(H5Dset_extent(did, ext_dims) < 0)
+    num_elmts = 1;
+    for(j = 0; j < (unsigned)ndims; j++)
+        num_elmts *= (unsigned)ext_dims[j];
+
+    /* Compound type */
+    if(!HDstrcmp(dname, DSET_CMPD_TWO)) {
+
+        HDmemset(cbuf, 0, TEST_BUF_SIZE * sizeof(set_t));
+        for(j = 0; j < num_elmts; j++) {
+            cbuf[j].field1 = action1;
+            cbuf[j].field2.a = action1;
+            cbuf[j].field2.c = action1;
+            cbuf[j].field2.b.a = action1;
+            cbuf[j].field2.b.b = action1;
+            cbuf[j].field2.b.c = action1;
+            cbuf[j].field3 = action1;
+            cbuf[j].field4.a = action1;
+            cbuf[j].field4.b = action1;
+        } /* end for */
+
+       /* Write to the dataset */
+        if(H5Dwrite(did, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, cbuf) < 0)
             goto error;
 
-        num_elmts = 1;
-        for(j = 0; j < (unsigned)ndims; j++)
-            num_elmts *= (unsigned)ext_dims[j];
-
-        /* Compound type */
-        if(!HDstrcmp(dname, DSET_CMPD_TWO)) {
-
-            HDmemset(cbuf, 0, TEST_BUF_SIZE * sizeof(set_t));
-            for(j = 0; j < num_elmts; j++) {
-                cbuf[j].field1 = i + 1;
-                cbuf[j].field2.a = i + 1;
-                cbuf[j].field2.c = i + 1;
-                cbuf[j].field2.b.a = i + 1;
-                cbuf[j].field2.b.b = i + 1;
-                cbuf[j].field2.b.c = i + 1;
-                cbuf[j].field3 = i + 1;
-                cbuf[j].field4.a = i + 1;
-                cbuf[j].field4.b = i + 1;
-            } /* end for */
+    } else { /* Integer type */
+        HDmemset(ibuf, 0, TEST_BUF_SIZE * sizeof(int));
+        for(j = 0; j < num_elmts; j++)
+            ibuf[j] = action1;
 
-            /* Write to the dataset */
-            if(H5Dwrite(did, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, cbuf) < 0)
-                goto error;
-        } else { /* Integer type */
-            HDmemset(ibuf, 0, TEST_BUF_SIZE * sizeof(int));
-            for(j = 0; j < num_elmts; j++)
-                ibuf[j] = (int)(i + 1);
-
-            /* Write to the dataset */
-            if(H5Dwrite(did, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, ibuf) < 0)
-                goto error;
-        } /* end if-else */
-
-        if(H5Dflush(did) < 0)
+        /* Write to the dataset */
+        if(H5Dwrite(did, dtid, H5S_ALL, H5S_ALL, H5P_DEFAULT, ibuf) < 0)
             goto error;
+    } /* end if-else */
 
-    } /* end for TWO_NTESTS */
+    if(H5Dflush(did) < 0)
+        goto error;
 
     /* Closing */
     if(H5Tclose(dtid) < 0) goto error;
@@ -227,8 +188,8 @@ extend_dset_two(const char *file, char *dname)
     if(H5Pclose(fapl) < 0) goto error;
     if(H5Fclose(fid) < 0) goto error;
 
-    HDfree(ibuf);
-    HDfree(cbuf);
+    if(ibuf) HDfree(ibuf);
+    if(cbuf) HDfree(cbuf);
 
     return SUCCEED;
 
@@ -252,21 +213,13 @@ error:
 /*
  ***********************************************************************
  *
- * Extending a one-dimensional dataset
- *    Test cases:
- *        #1: increase
- *        #2: decrease
- *        #3: same
- *        #4: decrease
- *        #5: increase
- *
- *     one_tests[ONE_NTESTS] = {3, -1, 0, -11, 2}
- *     varies from 10->13->12->12->1->3
+ * Extending a one-dimensional dataset by action:
+ *        --action can be a positive # or negative # or 0.
  *
  ***********************************************************************
  */
 static herr_t
-extend_dset_one(const char *file, char *dname)
+extend_dset_one(const char *file, char *dname, int action)
 {
     hid_t fid = -1;         /* file id                                          */
     hid_t fapl = -1;        /* file access property list id                     */
@@ -319,80 +272,75 @@ extend_dset_one(const char *file, char *dname)
     if(h5_wait_message(READER_MESSAGE) < 0)
         goto error;
 
-    /* Loop through different variations of extending the dataset */
-    for(i = 0; i < ONE_NTESTS; i++) {
+    /* sleep to emulate about 2 seconds of application operation */
+    HDsleep(2);
+
+    /* Get current dimension sizes */
+    if(H5LDget_dset_dims(did, cur_dims) < 0)
+        goto error;
+
+    /* Set up the new extended dimension sizes  */
+    ext_dims[0] = cur_dims[0] + (hsize_t)action;
 
-        /* sleep to emulate about 2 seconds of application operation */
-        HDsleep(2);
+    /* Extend the dataset */
+    if(H5Dset_extent(did, ext_dims) < 0)
+        goto error;
 
-        /* Get current dimension sizes */
-        if(H5LDget_dset_dims(did, cur_dims) < 0)
-            goto error;
+    /* Write to the new appended region of the dataset */
+    if(action > 0) {
 
-        /* Set up the new extended dimension sizes  */
-        ext_dims[0] = cur_dims[0] + (hsize_t)one_tests[i];
+        /* Select the extended region */
+        offset[0] = cur_dims[0];
+        count[0] = (hsize_t)action;
+        if((sid = H5Dget_space(did)) < 0)
+            goto error;
+        if(H5Sselect_hyperslab(sid, H5S_SELECT_SET, offset, NULL, count, NULL) < 0)
+            goto error;
 
-        /* Extend the dataset */
-        if(H5Dset_extent(did, ext_dims) < 0)
+        /* Set up memory space and get dataset's datatype */
+        if((mid = H5Screate_simple(1, count, NULL)) < 0)
             goto error;
 
-        /* Write to the new appended region of the dataset */
-        if(one_tests[i] > 0) {
+        /* Initialize data for the extended region of the dataset */
+        /* Compound type */
+        if(!HDstrcmp(dname, DSET_CMPD) || !HDstrcmp(dname, DSET_CMPD_ESC)) {
 
-            /* Select the extended region */
-            offset[0] = cur_dims[0];
-            count[0] = (hsize_t)one_tests[i];
-            if((sid = H5Dget_space(did)) < 0)
-                goto error;
-            if(H5Sselect_hyperslab(sid, H5S_SELECT_SET, offset, NULL, count, NULL) < 0)
+            HDmemset(cbuf, 0, TEST_BUF_SIZE * sizeof(set_t));
+            for(j = 0; j < (unsigned)action; j++) {
+                cbuf[j].field1 = j + 1;
+                cbuf[j].field2.a = j + 2;
+                cbuf[j].field2.b.a = j + 2;
+                cbuf[j].field2.b.b = j + 2;
+                cbuf[j].field2.b.c = j + 2;
+                cbuf[j].field2.c = j + 2;
+
+                cbuf[j].field3 = j + 3;
+
+                cbuf[j].field4.a = j + 4;
+                cbuf[j].field4.b = j + 4;
+            } /* end for */
+
+            /* Write to the extended region of the dataset */
+            if(H5Dwrite(did, dtid, mid, sid, H5P_DEFAULT, cbuf) < 0)
                 goto error;
+        } else { /* Integer type */
+
+            HDmemset(ibuf, 0, TEST_BUF_SIZE * sizeof(int));
+            for(j = 0; j < (unsigned)action; j++)
+                ibuf[j] = (int)j;
 
-            /* Set up memory space and get dataset's datatype */
-            if((mid = H5Screate_simple(1, count, NULL)) < 0)
+            /* Write to the extended region of the dataset */
+            if(H5Dwrite(did, dtid, mid, sid, H5P_DEFAULT, ibuf) < 0)
                 goto error;
+        } /* end if-else */
 
-            /* Initialize data for the extended region of the dataset */
-            /* Compound type */
-            if(!HDstrcmp(dname, DSET_CMPD) || !HDstrcmp(dname, DSET_CMPD_ESC)) {
-
-                HDmemset(cbuf, 0, TEST_BUF_SIZE * sizeof(set_t));
-                for(j = 0; j < (unsigned)one_tests[i]; j++) {
-                    cbuf[j].field1 = j + 1;
-                    cbuf[j].field2.a = j + 2;
-                    cbuf[j].field2.b.a = j + 2;
-                    cbuf[j].field2.b.b = j + 2;
-                    cbuf[j].field2.b.c = j + 2;
-                    cbuf[j].field2.c = j + 2;
-
-                    cbuf[j].field3 = j + 3;
-
-                    cbuf[j].field4.a = j + 4;
-                    cbuf[j].field4.b = j + 4;
-                } /* end for */
-
-                /* Write to the extended region of the dataset */
-                if(H5Dwrite(did, dtid, mid, sid, H5P_DEFAULT, cbuf) < 0)
-                    goto error;
-            } else { /* Integer type */
-
-                HDmemset(ibuf, 0, TEST_BUF_SIZE * sizeof(int));
-                for(j = 0; j < (unsigned)one_tests[i]; j++)
-                    ibuf[j] = (int)j;
-
-                /* Write to the extended region of the dataset */
-                if(H5Dwrite(did, dtid, mid, sid, H5P_DEFAULT, ibuf) < 0)
-                    goto error;
-            } /* end if-else */
-
-            /* Closing */
-            if(H5Sclose(sid) < 0) goto error;
-            if(H5Sclose(mid) < 0) goto error;
-        } /* end if */
-
-        if(H5Dflush(did) < 0)
-            goto error;
+        /* Closing */
+        if(H5Sclose(sid) < 0) goto error;
+        if(H5Sclose(mid) < 0) goto error;
+    } /* end if */
 
-    } /* end for ONE_NTESTS */
+    if(H5Dflush(did) < 0)
+        goto error;
 
     /* Closing */
     if(H5Tclose(dtid) < 0) goto error;
@@ -400,8 +348,8 @@ extend_dset_one(const char *file, char *dname)
     if(H5Pclose(fapl) < 0) goto error;
     if(H5Fclose(fid) < 0) goto error;
 
-    HDfree(ibuf);
-    HDfree(cbuf);
+    if(ibuf) HDfree(ibuf);
+    if(cbuf) HDfree(cbuf);
 
     return SUCCEED;
 
@@ -423,30 +371,44 @@ error:
     return FAIL;
 } /* end extend_dset_one() */
 
-/* Usage: extend_dset xx.h5 dname */
+
+/*
+ ***********************************************************************
+ *
+ * Usage: extend_dset xx.h5 dname action1 action2
+ *        --action1 and action2 can be a positive # or negative # or 0.
+ *
+ ***********************************************************************
+ */
 int
 main(int argc, const char *argv[])
 {
     char *dname = NULL;
     char *fname = NULL;
+    int action1, action2;
 
-    if(argc != 3) {
-        HDfprintf(stderr, "Should have file name and dataset name to be extended...\n");
+    if(argc != 5) {
+        HDfprintf(stderr, "Should have file name, dataset name, and the extended amount...\n");
         goto error;
     } /* end if */
 
     /* Get the dataset name to be extended */
     fname = HDstrdup(argv[1]);
     dname = HDstrdup(argv[2]);
+    action1 = HDatoi(argv[3]);
+    action2 = HDatoi(argv[4]);
 
     if(!HDstrcmp(dname, DSET_CMPD) || !HDstrcmp(dname, DSET_CMPD_ESC)) {
-        if(extend_dset_one(fname, dname) < 0)
+        if(extend_dset_one(fname, dname, action1) < 0)
             goto error;
-    } else if(!HDstrcmp(dname, DSET_ONE) || !HDstrcmp(dname, DSET_ALLOC_LATE) || !HDstrcmp(dname, DSET_ALLOC_EARLY)) {
-        if(extend_dset_one(fname, dname) < 0)
+    } else if(!HDstrcmp(dname, DSET_ONE) || 
+              !HDstrcmp(dname, DSET_ALLOC_LATE) || 
+              !HDstrcmp(dname, DSET_ALLOC_EARLY)) {
+        if(extend_dset_one(fname, dname, action1) < 0)
             goto error;
-    } else if(!HDstrcmp(dname, DSET_TWO) || !HDstrcmp(dname, DSET_CMPD_TWO)) {
-        if(extend_dset_two(fname, dname) < 0)
+    } else if(!HDstrcmp(dname, DSET_TWO) || 
+              !HDstrcmp(dname, DSET_CMPD_TWO)) {
+        if(extend_dset_two(fname, dname, action1, action2) < 0)
             goto error;
     } else {
         HDfprintf(stdout, "Dataset cannot be extended...\n");
@@ -462,4 +424,3 @@ error:
         HDfree(fname);
     HDexit(EXIT_FAILURE);
 } /* end main() */
-