Merge branch 'develop' into h5pl_commit

3 files changed, 42 insertions, 0 deletions

diff --git a/test/fheap.c b/test/fheap.c
index 4be6cb9..6c3a8ac 100644
--- a/test/fheap.c
+++ b/test/fheap.c
@@ -16377,6 +16377,16 @@ main(void)
     unsigned	nerrors = 0;            /* Cumulative error count */
     unsigned num_pb_fs = 1;             /* The number of settings to test for page buffering and file space handling */
     int	ExpressMode;                    /* Express testing level */
+    const char *envval;                 /* Environment variable */
+    hbool_t contig_addr_vfd;            /* Whether VFD used has a contigous address space */
+
+    /* Don't run this test using certain file drivers */
+    envval = HDgetenv("HDF5_DRIVER");
+    if(envval == NULL)
+        envval = "nomatch";
+
+    /* Current VFD that does not support contigous address space */
+    contig_addr_vfd = (hbool_t)(HDstrcmp(envval, "split") && HDstrcmp(envval, "multi"));
 
     /* Reset library */
     h5_reset();
@@ -16428,6 +16438,12 @@ main(void)
         shared_wobj_g[u] = (unsigned char)u;
 
     for(v = 0; v < num_pb_fs; v++) {
+        /* Skip test when:
+           a) multi/split drivers and
+           b) persisting free-space or using paged aggregation strategy 
+           because the library will fail file creation (temporary) for the above conditions */
+        if(!contig_addr_vfd && v)
+            break;
 
         if((fcpl = H5Pcopy(def_fcpl)) < 0) 
             TEST_ERROR
diff --git a/test/plugin.c b/test/plugin.c
index f536a9e..bcd7348 100644
--- a/test/plugin.c
+++ b/test/plugin.c
@@ -737,6 +737,15 @@ test_path_api_calls(void)
      */
     n_starting_paths = 42;
 
+    /* Check that initialization is correct */
+    TESTING("    initialize");
+
+    if(H5PLsize(&n_paths) < 0)
+        TEST_ERROR
+    if(n_paths != 2)
+        TEST_ERROR
+
+    PASSED();
 
     /****************/
     /* H5PLremove() */
diff --git a/test/tfile.c b/test/tfile.c
index 533bb24..027ad62 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -109,6 +109,7 @@
 #define TEST_THRESHOLD10    10                          /* Free space section threshold */
 #define FSP_SIZE_DEF        4096                        /* File space page size default */
 #define FSP_SIZE512         512                         /* File space page size */
+#define FSP_SIZE1G          1024*1024*1024              /* File space page size */
 
 /* Declaration for test_libver_macros2() */
 #define FILE6			"tfile6.h5"	/* Test file */
@@ -3581,6 +3582,9 @@ test_filespace_info(const char *env_h5_drvr)
      *  Setting value less than 512 will return an error;
      *      --setting file space page size to 0
      *      --setting file space page size to 511
+     *
+     *  File space page size has a maximum size of 1 gigabyte.
+     *  Setting value greater than 1 gigabyte will return an error.
      */
     /* Create file creation property list template */
     fcpl = H5Pcreate(H5P_FILE_CREATE);
@@ -3598,6 +3602,12 @@ test_filespace_info(const char *env_h5_drvr)
     } H5E_END_TRY;
     VERIFY(ret, FAIL, "H5Pset_file_space_page_size");
 
+    /* Setting to 1GB+1: should fail */
+    H5E_BEGIN_TRY {
+        ret = H5Pset_file_space_page_size(fcpl, FSP_SIZE1G+1);
+    } H5E_END_TRY;
+    VERIFY(ret, FAIL, "H5Pset_file_space_page_size");
+
     /* Setting to 512: should succeed */
     ret = H5Pset_file_space_page_size(fcpl, FSP_SIZE512);
     CHECK(ret, FAIL, "H5Pset_file_space_page_size");
@@ -3605,6 +3615,13 @@ test_filespace_info(const char *env_h5_drvr)
     CHECK(ret, FAIL, "H5Pget_file_space_page_size");
     VERIFY(fsp_size, FSP_SIZE512, "H5Pget_file_space_page_size");
 
+    /* Setting to 1GB: should succeed */
+    ret = H5Pset_file_space_page_size(fcpl, FSP_SIZE1G);
+    CHECK(ret, FAIL, "H5Pset_file_space_page_size");
+    ret = H5Pget_file_space_page_size(fcpl, &fsp_size);
+    CHECK(ret, FAIL, "H5Pget_file_space_page_size");
+    VERIFY(fsp_size, FSP_SIZE1G, "H5Pget_file_space_page_size");
+
     /* Close property list */
     H5Pclose(fcpl);