Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)

* commit '048ae59d2970dd21810577c999f756c028b6faaf':
  Correct errors with non-"instrumented library" builds (production & parallel, generally speaking).
  Update java error stack tests
  Revert using H5MF_sect_small_can_shrink and H5MF_sect_small_shrink for the file's free space manager (and add a comment about them).
  Add comment for the file flush when the file low / high bounds are changed after a file is open.
  Expanded comments abuot H5CX_t fields.
  Add an assert to verify that we don't write when between MPI_Barrier() calls during a flush.
  Add comments for internal structs.
  Remove redundant 'is_collective' parameter from H5CX_set_loc.
  Correct typo in comment.
  Revert some tangential code cleanups.
  Add API context source files to CMake configuration file.
  Corrections for parallel I/O & tests.
  Update handling of reporting for breaking collective I/O when the default DXPL is used.
  Update encoded DXPLs to reflect changes in properties.
  Correct typo for error checking malloc return value.
  Refactor H5CX code to reduce duplication.
  Cleanup API context function usage.
  Add API context interface and use it throughout the library.

1 files changed, 14 insertions, 0 deletions

diff --git a/test/unregister.c b/test/unregister.c
index a4bf24e..dbf6293 100644
--- a/test/unregister.c
+++ b/test/unregister.c
@@ -16,6 +16,7 @@
  * Purpose:	Tests H5Zunregister function
  */
 #include "h5test.h"
+#include "H5CXprivate.h"        /* API Contexts                         */
 
 const char *FILENAME[] = {
     "unregister_filter_1",
@@ -230,17 +231,27 @@ main(void)
 {
     hid_t		fapl;
     int	nerrors = 0;
+    hbool_t     api_ctx_pushed = FALSE;             /* Whether API context pushed */
 
     /* Testing setup */
     h5_reset();
     fapl = h5_fileaccess();
 
+    /* Push API context */
+    if(H5CX_push() < 0) FAIL_STACK_ERROR
+    api_ctx_pushed = TRUE;
+
     /* Test unregistering filter in its own file */
     nerrors += (test_unregister_filters(fapl) < 0           ? 1 : 0);
 
     if(nerrors)
         goto error;
     printf("All filter unregistration tests passed.\n");
+
+    /* Pop API context */
+    if(api_ctx_pushed && H5CX_pop() < 0) FAIL_STACK_ERROR
+    api_ctx_pushed = FALSE;
+
     h5_cleanup(FILENAME, fapl);
 
     return 0;
@@ -249,6 +260,9 @@ error:
     nerrors = MAX(1, nerrors);
     printf("***** %d FILTER UNREGISTRATION TEST%s FAILED! *****\n",
             nerrors, 1 == nerrors ? "" : "S");
+
+    if(api_ctx_pushed) H5CX_pop();
+
     return 1;
 }