Add flag to H5CX_pop that allow setting the properties to return to application to be skipped. (#134)

17 files changed, 35 insertions, 35 deletions

diff --git a/test/accum.c b/test/accum.c
index 46015c9..7561cd0 100644
--- a/test/accum.c
+++ b/test/accum.c
@@ -139,7 +139,7 @@ main(void)
     nerrors += test_random_write(f);
 
     /* Pop API context */
-    if (api_ctx_pushed && H5CX_pop() < 0)
+    if (api_ctx_pushed && H5CX_pop(FALSE) < 0)
         FAIL_STACK_ERROR
     api_ctx_pushed = FALSE;
 
@@ -160,7 +160,7 @@ main(void)
 
 error:
     if (api_ctx_pushed)
-        H5CX_pop();
+        H5CX_pop(FALSE);
 
     HDputs("*** TESTS FAILED ***");
     return 1;
@@ -2266,7 +2266,7 @@ test_swmr_write_big(hbool_t newest_format)
             FAIL_STACK_ERROR;
 
         /* Pop API context */
-        if (api_ctx_pushed && H5CX_pop() < 0)
+        if (api_ctx_pushed && H5CX_pop(FALSE) < 0)
             FAIL_STACK_ERROR
         api_ctx_pushed = FALSE;
 
@@ -2284,7 +2284,7 @@ error:
     H5Fclose(fid);
 
     if (api_ctx_pushed)
-        H5CX_pop();
+        H5CX_pop(FALSE);
 
     H5Pclose(fapl);
 
diff --git a/test/accum_swmr_reader.c b/test/accum_swmr_reader.c
index 1d48d43..6c0a358 100644
--- a/test/accum_swmr_reader.c
+++ b/test/accum_swmr_reader.c
@@ -98,7 +98,7 @@ main(void)
         FAIL_STACK_ERROR;
 
     /* Pop API context */
-    if (api_ctx_pushed && H5CX_pop() < 0)
+    if (api_ctx_pushed && H5CX_pop(FALSE) < 0)
         FAIL_STACK_ERROR
     api_ctx_pushed = FALSE;
 
@@ -113,7 +113,7 @@ error:
     H5E_END_TRY;
 
     if (api_ctx_pushed)
-        H5CX_pop();
+        H5CX_pop(FALSE);
 
     return EXIT_FAILURE;
 } /* end main() */
diff --git a/test/btree2.c b/test/btree2.c
index 919a6ee..613d8d5 100644
--- a/test/btree2.c
+++ b/test/btree2.c
@@ -10016,7 +10016,7 @@ main(void)
     nerrors += (h5_verify_cached_stabs(FILENAME, fapl) < 0 ? 1 : 0);
 
     /* Pop API context */
-    if (api_ctx_pushed && H5CX_pop() < 0)
+    if (api_ctx_pushed && H5CX_pop(FALSE) < 0)
         FAIL_STACK_ERROR
     api_ctx_pushed = FALSE;
 
@@ -10036,7 +10036,7 @@ error:
     H5E_END_TRY;
 
     if (api_ctx_pushed)
-        H5CX_pop();
+        H5CX_pop(FALSE);
 
     return 1;
 } /* end main() */
diff --git a/test/cache.c b/test/cache.c
index 0e923fd..5b54bb9 100644
--- a/test/cache.c
+++ b/test/cache.c
@@ -35871,7 +35871,7 @@ takedown_cache(H5F_t *file_ptr, hbool_t dump_stats, hbool_t dump_detailed_stats)
         }
 
         /* Pop API context */
-        H5CX_pop();
+        H5CX_pop(FALSE);
 
         if ((!try_core_file_driver) || (core_file_driver_failed)) {
 
diff --git a/test/cache_tagging.c b/test/cache_tagging.c
index 9d0aa3e..5f94f8a 100644
--- a/test/cache_tagging.c
+++ b/test/cache_tagging.c
@@ -4520,7 +4520,7 @@ check_invalid_tag_application(void)
         TEST_ERROR;
 
     /* Pop API context */
-    if (api_ctx_pushed && H5CX_pop() < 0)
+    if (api_ctx_pushed && H5CX_pop(FALSE) < 0)
         TEST_ERROR
     api_ctx_pushed = FALSE;
 
@@ -4540,7 +4540,7 @@ check_invalid_tag_application(void)
 #if H5C_DO_TAGGING_SANITY_CHECKS
 error:
     if (api_ctx_pushed)
-        H5CX_pop();
+        H5CX_pop(FALSE);
 
     return 1;
 #endif /* H5C_DO_TAGGING_SANITY_CHECKS */
diff --git a/test/dsets.c b/test/dsets.c
index 2e9e3db..9efc151 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -3010,7 +3010,7 @@ test_missing_filter(hid_t file)
 #endif /* H5_HAVE_FILTER_DEFLATE */
 
     /* Pop API context */
-    if (api_ctx_pushed && H5CX_pop() < 0)
+    if (api_ctx_pushed && H5CX_pop(FALSE) < 0)
         FAIL_STACK_ERROR
     api_ctx_pushed = FALSE;
 
@@ -3019,7 +3019,7 @@ test_missing_filter(hid_t file)
 
 error:
     if (api_ctx_pushed)
-        H5CX_pop();
+        H5CX_pop(FALSE);
 
     return FAIL;
 } /* end test_missing_filter() */
diff --git a/test/earray.c b/test/earray.c
index 21db0d8..845b4c5 100644
--- a/test/earray.c
+++ b/test/earray.c
@@ -2552,7 +2552,7 @@ main(void)
     nerrors += (h5_verify_cached_stabs(FILENAME, fapl) < 0 ? 1 : 0);
 
     /* Pop API context */
-    if (api_ctx_pushed && H5CX_pop() < 0)
+    if (api_ctx_pushed && H5CX_pop(FALSE) < 0)
         FAIL_STACK_ERROR
     api_ctx_pushed = FALSE;
 
@@ -2572,7 +2572,7 @@ error:
     H5E_END_TRY;
 
     if (api_ctx_pushed)
-        H5CX_pop();
+        H5CX_pop(FALSE);
 
     return 1;
 } /* end main() */
diff --git a/test/efc.c b/test/efc.c
index c0b41b2..b8d7ed9 100644
--- a/test/efc.c
+++ b/test/efc.c
@@ -2704,7 +2704,7 @@ main(void)
     nerrors += (h5_verify_cached_stabs(FILENAME, fapl_id) < 0 ? 1 : 0);
 
     /* Pop API context */
-    if (api_ctx_pushed && H5CX_pop() < 0)
+    if (api_ctx_pushed && H5CX_pop(FALSE) < 0)
         FAIL_STACK_ERROR
     api_ctx_pushed = FALSE;
 
@@ -2728,7 +2728,7 @@ error:
     H5E_END_TRY
 
     if (api_ctx_pushed)
-        H5CX_pop();
+        H5CX_pop(FALSE);
 
     for (i = 0; i < N_FILENAMES; i++) {
         HDfree(filename[i]);
diff --git a/test/farray.c b/test/farray.c
index 5758a3f..09421c0 100644
--- a/test/farray.c
+++ b/test/farray.c
@@ -1767,7 +1767,7 @@ main(void)
     nerrors += (h5_verify_cached_stabs(FILENAME, fapl) < 0 ? 1 : 0);
 
     /* Pop API context */
-    if (api_ctx_pushed && H5CX_pop() < 0)
+    if (api_ctx_pushed && H5CX_pop(FALSE) < 0)
         FAIL_STACK_ERROR
     api_ctx_pushed = FALSE;
 
@@ -1787,7 +1787,7 @@ error:
     H5E_END_TRY;
 
     if (api_ctx_pushed)
-        H5CX_pop();
+        H5CX_pop(FALSE);
 
     HDexit(EXIT_FAILURE);
 } /* end main() */
diff --git a/test/fheap.c b/test/fheap.c
index f8f9d16..e29551e 100644
--- a/test/fheap.c
+++ b/test/fheap.c
@@ -16885,7 +16885,7 @@ main(void)
         TEST_ERROR
 
     /* Pop API context */
-    if (api_ctx_pushed && H5CX_pop() < 0)
+    if (api_ctx_pushed && H5CX_pop(FALSE) < 0)
         FAIL_STACK_ERROR
     api_ctx_pushed = FALSE;
 
@@ -16911,7 +16911,7 @@ error:
     H5E_END_TRY;
 
     if (api_ctx_pushed)
-        H5CX_pop();
+        H5CX_pop(FALSE);
 
     return 1;
 } /* end main() */
diff --git a/test/freespace.c b/test/freespace.c
index 4b6f54c..0ab1d72 100644
--- a/test/freespace.c
+++ b/test/freespace.c
@@ -2907,7 +2907,7 @@ main(void)
     HDputs("All free-space tests passed.");
 
     /* Pop API context */
-    if (api_ctx_pushed && H5CX_pop() < 0)
+    if (api_ctx_pushed && H5CX_pop(FALSE) < 0)
         FAIL_STACK_ERROR
     api_ctx_pushed = FALSE;
 
@@ -2920,7 +2920,7 @@ error:
     H5E_END_TRY;
 
     if (api_ctx_pushed)
-        H5CX_pop();
+        H5CX_pop(FALSE);
 
     HDexit(EXIT_FAILURE);
 } /* main() */
diff --git a/test/gheap.c b/test/gheap.c
index 1a8a4c0..be4b619 100644
--- a/test/gheap.c
+++ b/test/gheap.c
@@ -589,7 +589,7 @@ main(void)
     HDputs("All global heap tests passed.");
 
     /* Pop API context */
-    if (api_ctx_pushed && H5CX_pop() < 0)
+    if (api_ctx_pushed && H5CX_pop(FALSE) < 0)
         FAIL_STACK_ERROR
     api_ctx_pushed = FALSE;
 
@@ -601,7 +601,7 @@ error:
     H5E_END_TRY;
 
     if (api_ctx_pushed)
-        H5CX_pop();
+        H5CX_pop(FALSE);
 
     HDputs("*** TESTS FAILED ***");
     HDexit(EXIT_FAILURE);
diff --git a/test/lheap.c b/test/lheap.c
index 27e025e..7780756 100644
--- a/test/lheap.c
+++ b/test/lheap.c
@@ -201,7 +201,7 @@ main(void)
         TEST_ERROR
 
     /* Pop API context */
-    if (api_ctx_pushed && H5CX_pop() < 0)
+    if (api_ctx_pushed && H5CX_pop(FALSE) < 0)
         FAIL_STACK_ERROR
     api_ctx_pushed = FALSE;
 
@@ -216,7 +216,7 @@ error:
     H5E_END_TRY;
 
     if (api_ctx_pushed)
-        H5CX_pop();
+        H5CX_pop(FALSE);
 
     return EXIT_FAILURE;
 }
diff --git a/test/mf.c b/test/mf.c
index a9240f9..f639434 100644
--- a/test/mf.c
+++ b/test/mf.c
@@ -9177,7 +9177,7 @@ main(void)
     h5_cleanup(FILENAME, fapl);
 
     /* Pop API context */
-    if (api_ctx_pushed && H5CX_pop() < 0)
+    if (api_ctx_pushed && H5CX_pop(FALSE) < 0)
         FAIL_STACK_ERROR
     api_ctx_pushed = FALSE;
 
@@ -9197,7 +9197,7 @@ error:
     H5E_END_TRY;
 
     if (api_ctx_pushed)
-        H5CX_pop();
+        H5CX_pop(FALSE);
 
     return (1);
 } /* main() */
diff --git a/test/ohdr.c b/test/ohdr.c
index 14d021b..5eed139 100644
--- a/test/ohdr.c
+++ b/test/ohdr.c
@@ -2040,7 +2040,7 @@ main(void)
         TEST_ERROR
 
     /* Pop API context */
-    if (api_ctx_pushed && H5CX_pop() < 0)
+    if (api_ctx_pushed && H5CX_pop(FALSE) < 0)
         FAIL_STACK_ERROR
     api_ctx_pushed = FALSE;
 
@@ -2054,7 +2054,7 @@ error:
     H5E_END_TRY;
 
     if (api_ctx_pushed)
-        H5CX_pop();
+        H5CX_pop(FALSE);
 
     return 1;
 } /* end main() */
diff --git a/test/page_buffer.c b/test/page_buffer.c
index abbae32..7a451b6 100644
--- a/test/page_buffer.c
+++ b/test/page_buffer.c
@@ -2184,7 +2184,7 @@ main(void)
         goto error;
 
     /* Pop API context */
-    if (api_ctx_pushed && H5CX_pop() < 0)
+    if (api_ctx_pushed && H5CX_pop(FALSE) < 0)
         FAIL_STACK_ERROR
     api_ctx_pushed = FALSE;
 
@@ -2199,7 +2199,7 @@ error:
     H5E_END_TRY;
 
     if (api_ctx_pushed)
-        H5CX_pop();
+        H5CX_pop(FALSE);
 
     HDexit(EXIT_FAILURE);
 } /* main() */
diff --git a/test/unregister.c b/test/unregister.c
index 775da82..79406a7 100644
--- a/test/unregister.c
+++ b/test/unregister.c
@@ -295,7 +295,7 @@ main(void)
     HDprintf("All filter unregistration tests passed.\n");
 
     /* Pop API context */
-    if (api_ctx_pushed && H5CX_pop() < 0)
+    if (api_ctx_pushed && H5CX_pop(FALSE) < 0)
         FAIL_STACK_ERROR
     api_ctx_pushed = FALSE;
 
@@ -306,7 +306,7 @@ error:
     HDprintf("***** %d FILTER UNREGISTRATION TEST%s FAILED! *****\n", nerrors, 1 == nerrors ? "" : "S");
 
     if (api_ctx_pushed)
-        H5CX_pop();
+        H5CX_pop(FALSE);
 
     HDexit(EXIT_FAILURE);
 } /* end main() */