Merge pull request #525 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:hdf5_1_8 to hdf5_1_8

* commit 'a59d5166bee9153c58c85847d19ad7fdd6beb7f6':
  Minor modifications for HDFFV-9934 Print out failure/success messages from running the tests in hl/test/test_dset_opt.c. Tested on emu, quail, kituo, platypus.

1 files changed, 14 insertions, 2 deletions

diff --git a/hl/test/test_dset_opt.c b/hl/test/test_dset_opt.c
index e3e7569..8a2eb55 100644
--- a/hl/test/test_dset_opt.c
+++ b/hl/test/test_dset_opt.c
@@ -40,8 +40,8 @@
 
 /* Datasets for Direct Read tests */
 #define DATASETNAME8        "disabled_chunk_cache"
-#define DATASETNAME9        "read_w_valid_cache"
-#define DATASETNAME10       "flush_chunk_cache"
+#define DATASETNAME9        "flush_chunk_cache"
+#define DATASETNAME10       "read_w_valid_cache"
 #define DATASETNAME11       "unallocated_chunk"
 #define DATASETNAME12       "unfiltered_data"
 
@@ -347,6 +347,7 @@ error:
     if(outbuf)
         HDfree(outbuf);
 
+    H5_FAILED();
     return 1;
 }
 #endif /* H5_HAVE_FILTER_DEFLATE */
@@ -453,6 +454,7 @@ error:
         H5Dclose(did);
     } H5E_END_TRY;
 
+    H5_FAILED();
     return 1;
 } /* end test_direct_chunk_overwrite_data() */
 
@@ -629,6 +631,7 @@ error:
         H5Pclose(dxpl);
     } H5E_END_TRY;
 
+    H5_FAILED();
     return 1;
 } /* test_skip_compress_write1() */
 
@@ -899,6 +902,7 @@ error:
         H5Pclose(dxpl);
     } H5E_END_TRY;
 
+    H5_FAILED();
     return 1;
 } /* test_skip_compress_write2() */
 
@@ -1127,6 +1131,7 @@ error:
         H5Tclose(dt);
     } H5E_END_TRY;
 
+    H5_FAILED();
     return 1;
 } /* test_data_conv() */
 
@@ -1338,6 +1343,7 @@ error:
         H5Pclose(dxpl);
     } H5E_END_TRY;
 
+    H5_FAILED();
     return 1;
 } /* test_invalid_parameters() */
 
@@ -1518,6 +1524,7 @@ error:
     if(outbuf)
         HDfree(outbuf);
 
+    H5_FAILED();
     return 1;
 } /* test_direct_chunk_read_no_cache() */
 #endif /* H5_HAVE_FILTER_DEFLATE */
@@ -1695,6 +1702,7 @@ error:
     if(outbuf)
         HDfree(outbuf);
 
+    H5_FAILED();
     return 1;
 } /* test_direct_chunk_read_cache() */
 #endif /* H5_HAVE_FILTER_DEFLATE */
@@ -1843,6 +1851,7 @@ error:
         H5Pclose(dxpl);
     } H5E_END_TRY;
 
+    H5_FAILED();
     return 1;
 } /* test_read_unfiltered_dset() */
 
@@ -1960,6 +1969,7 @@ error:
         H5Pclose(dxpl);
     } H5E_END_TRY;
 
+    H5_FAILED();
     return 1;
 } /* test_read_unallocated_chunk() */
 
@@ -2015,8 +2025,10 @@ int main( void )
     if (nerrors)
         goto error;
 
+    HDputs("All direct chunk read/write tests passed.");
     return EXIT_SUCCESS;
 
 error:
+    HDputs("*** TESTS FAILED ***");
     return EXIT_FAILURE;
 }