diff options
author | Vailin Choi <vchoi@hdfgroup.org> | 2017-04-13 15:06:19 (GMT) |
---|---|---|
committer | Vailin Choi <vchoi@hdfgroup.org> | 2017-04-13 15:06:19 (GMT) |
commit | 7ff4c5fd7a5670489f7505fb2f765148ca748c45 (patch) | |
tree | dda4a324752674c61cbc15ef8b75db483ff313ba | |
parent | f574d627d8122c6ac7dcc16c9fd0d04cf97b6b67 (diff) | |
parent | 3d1b227a67b557da247f6b683f58617b6d75bfdb (diff) | |
download | hdf5-7ff4c5fd7a5670489f7505fb2f765148ca748c45.zip hdf5-7ff4c5fd7a5670489f7505fb2f765148ca748c45.tar.gz hdf5-7ff4c5fd7a5670489f7505fb2f765148ca748c45.tar.bz2 |
Merge pull request #421 in HDFFV/hdf5 from ~VCHOI/my_hdf5_fork:develop to develop
* commit '3d1b227a67b557da247f6b683f58617b6d75bfdb':
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.
-rw-r--r-- | test/fheap.c | 13 |
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); |