summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorlrknox <lrknox>2017-04-13 21:28:03 (GMT)
committerlrknox <lrknox>2017-04-13 21:28:03 (GMT)
commitb03e41146a3e15c7a287ab98f1963bf7944719a8 (patch)
treee0ba810f8994d14e5b984d0519f4f3c0bbd0fcc4 /test
parentf6920ad11c9c9b9033bbc9af1c6f08aacca15316 (diff)
parent906c1819188755a04fde6cc0ad7346775a6e61b8 (diff)
downloadhdf5-b03e41146a3e15c7a287ab98f1963bf7944719a8.zip
hdf5-b03e41146a3e15c7a287ab98f1963bf7944719a8.tar.gz
hdf5-b03e41146a3e15c7a287ab98f1963bf7944719a8.tar.bz2
Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~lrknox/hdf5_lrk into hdf5_1_10
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);