diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2017-03-14 19:31:10 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2017-03-14 19:31:10 (GMT) |
commit | 3fcfb3674842338f2b4d7e1e97e2fee678a021e7 (patch) | |
tree | f6e58cf6e4dfcb16e0f53e57d648af707d03ee16 /test/set_extent.c | |
parent | 2687321987f6ded4f85f138f8572abe96ce90264 (diff) | |
parent | d0aeefd6455d6877afd934e238362636a86e4b42 (diff) | |
download | hdf5-3fcfb3674842338f2b4d7e1e97e2fee678a021e7.zip hdf5-3fcfb3674842338f2b4d7e1e97e2fee678a021e7.tar.gz hdf5-3fcfb3674842338f2b4d7e1e97e2fee678a021e7.tar.bz2 |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'd0aeefd6455d6877afd934e238362636a86e4b42':
Final merge of page buffering branch to develop
Diffstat (limited to 'test/set_extent.c')
-rw-r--r-- | test/set_extent.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/test/set_extent.c b/test/set_extent.c index a992419..17dc6a0 100644 --- a/test/set_extent.c +++ b/test/set_extent.c @@ -139,6 +139,15 @@ int main( void ) unsigned new_format; /* Whether to use the latest file format */ unsigned chunk_cache; /* Whether to enable chunk caching */ int nerrors = 0; + const char *env_h5_drvr; /* File Driver value from environment */ + hbool_t contig_addr_vfd; /* Whether VFD used has a contigous address space */ + + + env_h5_drvr = HDgetenv("HDF5_DRIVER"); + if(env_h5_drvr == NULL) + env_h5_drvr = "nomatch"; + /* Current VFD that does not support contigous address space */ + contig_addr_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") && HDstrcmp(env_h5_drvr, "multi")); /* Initialize random number seed */ HDsrandom((unsigned)HDtime(NULL)); @@ -194,12 +203,15 @@ int main( void ) H5F_LIBVER_LATEST) < 0) TEST_ERROR /* Tests which use chunked datasets */ - nerrors += do_ranks( my_fapl, new_format ) < 0 ? 1 : 0; + if(!new_format || (new_format && contig_addr_vfd)) + nerrors += do_ranks( my_fapl, new_format ) < 0 ? 1 : 0; } /* end for */ /* Tests which do not use chunked datasets */ - nerrors += test_external( fapl ) < 0 ? 1 : 0; - nerrors += do_layouts( fapl ) < 0 ? 1 : 0; + if(!new_format || (new_format && contig_addr_vfd)) { + nerrors += test_external( fapl ) < 0 ? 1 : 0; + nerrors += do_layouts( fapl ) < 0 ? 1 : 0; + } } /* end for */ /* Close 2nd FAPL */ |