Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into develop

1 files changed, 26 insertions, 14 deletions

diff --git a/test/trefer.c b/test/trefer.c
index cd09c8e..dec049e 100644
--- a/test/trefer.c
+++ b/test/trefer.c
@@ -568,7 +568,7 @@ test_reference_region(H5F_libver_t libver_low, H5F_libver_t libver_high)
     hsize_t high[SPACE2_RANK];      /* Selection bounds */
     H5R_ref_t *wbuf,                   /* buffer to write to disk */
            *rbuf;                   /* buffer read from disk */
-    H5R_ref_t  nvrbuf[3]={{{0}},{{101}},{{255}}}; /* buffer with non-valid refs */
+    H5R_ref_t  nvrbuf[3]={{{0}},{{101}},{{-128}}}; /* buffer with non-valid refs */
     uint8_t *dwbuf,                 /* Buffer for writing numeric data to disk */
             *drbuf;                 /* Buffer for reading numeric data from disk */
     uint8_t *tu8;                   /* Temporary pointer to uint8 data */
@@ -2516,7 +2516,8 @@ test_reference_perf(void)
         ret = H5Rdestroy(&wbuf[0]);
         CHECK(ret, FAIL, "H5Rdestroy");
     }
-    HDprintf("--- Object reference create time: %lfs\n", t / MAX_ITER_CREATE);
+    if(VERBOSE_MED)
+        HDprintf("--- Object reference create time: %lfs\n", t / MAX_ITER_CREATE);
 
     /* Create reference to dataset */
     ret = H5Rcreate_object(fid1, "/Group1/Dataset1", H5P_DEFAULT, &wbuf[0]);
@@ -2534,7 +2535,8 @@ test_reference_perf(void)
         t2 = H5_get_time();
         t += t2 - t1;
     }
-    HDprintf("--- Object reference  write time: %lfs\n", t / MAX_ITER_WRITE);
+    if(VERBOSE_MED)
+        HDprintf("--- Object reference  write time: %lfs\n", t / MAX_ITER_WRITE);
 
     /* Close Dataset */
     ret = H5Dclose(dataset);
@@ -2552,7 +2554,8 @@ test_reference_perf(void)
         t2 = H5_get_time();
         t += t2 - t1;
     }
-    HDprintf("--- Deprecated object reference create time: %lfs\n", t / MAX_ITER_CREATE);
+    if(VERBOSE_MED)
+        HDprintf("--- Deprecated object reference create time: %lfs\n", t / MAX_ITER_CREATE);
 
     /* Create reference to dataset */
     ret = H5Rcreate(&wbuf_deprec[0], fid1, "/Group1/Dataset1", H5R_OBJECT1, H5I_INVALID_HID);
@@ -2567,7 +2570,8 @@ test_reference_perf(void)
         t2 = H5_get_time();
         t += t2 - t1;
     }
-    HDprintf("--- Deprecated object reference  write time: %lfs\n", t / MAX_ITER_WRITE);
+    if(VERBOSE_MED)
+        HDprintf("--- Deprecated object reference  write time: %lfs\n", t / MAX_ITER_WRITE);
 
     /* Close Dataset */
     ret = H5Dclose(dataset);
@@ -2588,7 +2592,8 @@ test_reference_perf(void)
         ret = H5Rdestroy(&wbuf_reg[0]);
         CHECK(ret, FAIL, "H5Rdestroy");
     }
-    HDprintf("--- Region reference create time: %lfs\n", t / MAX_ITER_CREATE);
+    if(VERBOSE_MED)
+        HDprintf("--- Region reference create time: %lfs\n", t / MAX_ITER_CREATE);
 
     /* Store first dataset region */
     ret = H5Rcreate_region(fid1, "/Group1/Dataset1", sid1, H5P_DEFAULT, &wbuf_reg[0]);
@@ -2603,7 +2608,8 @@ test_reference_perf(void)
         t2 = H5_get_time();
         t += t2 - t1;
     }
-    HDprintf("--- Region reference  write time: %lfs\n", t / MAX_ITER_WRITE);
+    if(VERBOSE_MED)
+        HDprintf("--- Region reference  write time: %lfs\n", t / MAX_ITER_WRITE);
 
     /* Close Dataset */
     ret = H5Dclose(dataset);
@@ -2622,7 +2628,8 @@ test_reference_perf(void)
         t2 = H5_get_time();
         t += t2 - t1;
     }
-    HDprintf("--- Deprecated region reference create time: %lfs\n", t / MAX_ITER_CREATE);
+    if(VERBOSE_MED)
+        HDprintf("--- Deprecated region reference create time: %lfs\n", t / MAX_ITER_CREATE);
 
     t = 0;
     for(i = 0; i < MAX_ITER_WRITE; i++) {
@@ -2633,7 +2640,8 @@ test_reference_perf(void)
         t2 = H5_get_time();
         t += t2 - t1;
     }
-    HDprintf("--- Deprecated region reference  write time: %lfs\n", t / MAX_ITER_WRITE);
+    if(VERBOSE_MED)
+        HDprintf("--- Deprecated region reference  write time: %lfs\n", t / MAX_ITER_WRITE);
 
     /* Close Dataset */
     ret = H5Dclose(dataset);
@@ -2666,7 +2674,8 @@ test_reference_perf(void)
         ret = H5Rdestroy(&rbuf[0]);
         CHECK(ret, FAIL, "H5Rdestroy");
     }
-    HDprintf("--- Object reference read time: %lfs\n", t / MAX_ITER_READ);
+    if(VERBOSE_MED)
+        HDprintf("--- Object reference read time: %lfs\n", t / MAX_ITER_READ);
 
     /* Read selection from disk */
     ret = H5Dread(dataset, H5T_STD_REF, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf);
@@ -2711,7 +2720,8 @@ test_reference_perf(void)
         t2 = H5_get_time();
         t += t2 - t1;
     }
-    HDprintf("--- Deprecated object reference read time: %lfs\n", t / MAX_ITER_READ);
+    if(VERBOSE_MED)
+        HDprintf("--- Deprecated object reference read time: %lfs\n", t / MAX_ITER_READ);
 
     /* Close Dataset */
     ret = H5Dclose(dataset);
@@ -2732,7 +2742,8 @@ test_reference_perf(void)
         ret = H5Rdestroy(&rbuf_reg[0]);
         CHECK(ret, FAIL, "H5Rdestroy");
     }
-    HDprintf("--- Region reference read time: %lfs\n", t / MAX_ITER_READ);
+    if(VERBOSE_MED)
+        HDprintf("--- Region reference read time: %lfs\n", t / MAX_ITER_READ);
 
     /* Read selection from disk */
     ret = H5Dread(dataset, H5T_STD_REF, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf_reg);
@@ -2755,7 +2766,8 @@ test_reference_perf(void)
         t2 = H5_get_time();
         t += t2 - t1;
     }
-    HDprintf("--- Deprecated region reference read time: %lfs\n", t / MAX_ITER_READ);
+    if(VERBOSE_MED)
+        HDprintf("--- Deprecated region reference read time: %lfs\n", t / MAX_ITER_READ);
 
     /* Close Dataset */
     ret = H5Dclose(dataset);
@@ -2816,7 +2828,7 @@ test_reference(void)
         for(high = H5F_LIBVER_EARLIEST; high < H5F_LIBVER_NBOUNDS; high++) {
 
             /* Invalid combinations, just continue */
-            if(high <= H5F_LIBVER_V112 || high < low)
+            if(high <= H5F_LIBVER_V110 || high < low)
                 continue;
 
             test_reference_region(low, high);       /* Test basic H5R dataset region reference code */