diff options
| author | Vailin Choi <vchoi@hdfgroup.org> | 2017-08-03 20:57:24 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@hdfgroup.org> | 2017-08-03 20:57:24 (GMT) |
| commit | c2ba92875edf2e605707cfc322d21916e3f05d22 (patch) | |
| tree | c4bc40a6bad08fd72d31ad8032193a25cc10b585 /test/fheap.c | |
| parent | 8eaef34ef0140182dffca391fb0bc63cd2ef2bd1 (diff) | |
| parent | 98d4addcf7cbec71600663e7023b6b7e0b5b5f35 (diff) | |
| download | hdf5-c2ba92875edf2e605707cfc322d21916e3f05d22.zip hdf5-c2ba92875edf2e605707cfc322d21916e3f05d22.tar.gz hdf5-c2ba92875edf2e605707cfc322d21916e3f05d22.tar.bz2 | |
Merge pull request #629 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:hdf5_1_10 to hdf5_1_10
* commit '98d4addcf7cbec71600663e7023b6b7e0b5b5f35':
Add h5repack tests for paged aggregation
Update release notes 1) Fixes for paged aggregation 2) Fix for HDFFV-10217 3) Fix for HDFFV-7853
Add h5repack tests for paged aggregation Add tests to h5repack.sh.in to verify options added for paged aggregation work as expected.
Skip test in test/fheap.c 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.
Changes made based on RFC review comments Test the changes in a branch via daily testing.
Diffstat (limited to 'test/fheap.c')
| -rw-r--r-- | test/fheap.c | 16 |
1 files changed, 16 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 |