summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2017-04-13 21:40:56 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2017-04-13 21:40:56 (GMT)
commitb77e601996ea89c8a25f0ce12e3a6a0058fac63e (patch)
treee0ba810f8994d14e5b984d0519f4f3c0bbd0fcc4 /test
parentf6920ad11c9c9b9033bbc9af1c6f08aacca15316 (diff)
parentb03e41146a3e15c7a287ab98f1963bf7944719a8 (diff)
downloadhdf5-b77e601996ea89c8a25f0ce12e3a6a0058fac63e.zip
hdf5-b77e601996ea89c8a25f0ce12e3a6a0058fac63e.tar.gz
hdf5-b77e601996ea89c8a25f0ce12e3a6a0058fac63e.tar.bz2
Merge pull request #425 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit 'b03e41146a3e15c7a287ab98f1963bf7944719a8': Skip tests for page buffering in test/fheap.c for parallel build Skip the two tests for page buffering in test/fheap.c because this feature is disabled in parallel. Activate full testing when this feature is re-enabled in the future for parallel build. Due to HDFVIEW-19 add read VL as string function Fix URL name updated with README changes DAILYTEST-250 change test props to reduce timeout Combined the README_DEVEL and README, and removed out-dated README material Fix for H5Dset_extent test failure with extensive array indexing (HDFFV-9771) 1) Calculate chunk index for extensive array index based on swizzled max chunks when unlim_dim > 0 2) Minor fixes to test/fheap.c that somehow were missed from last check in. See pull request #396 review comments.
Diffstat (limited to 'test')
-rw-r--r--test/fheap.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/test/fheap.c b/test/fheap.c
index d2a7900..e741aad 100644
--- a/test/fheap.c
+++ b/test/fheap.c
@@ -16388,14 +16388,23 @@ main(void)
/*
* Caution when turning on ExpressMode 0:
- * It will activate testing with different combinations of
+ * It will activate testing with different combinations of
* page buffering and file space strategy and the
* running time will be long.
+ * For parallel build, the last two tests for page buffering
+ * are skipped because this feature is disabled in parallel.
+ * Activate full testing when this feature is re-enabled
+ * in the future for parallel build.
*/
if(ExpressMode > 1)
HDprintf("***Express test mode on. Some tests may be skipped\n");
- else if(ExpressMode == 0)
+ else if(ExpressMode == 0) {
+#ifdef H5_HAVE_PARALLEL
+ num_pb_fs = NUM_PB_FS - 2;
+#else
num_pb_fs = NUM_PB_FS;
+#endif
+ }
/* Initialize heap creation parameters */
init_small_cparam(&small_cparam);