summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2017-04-20 20:11:47 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2017-04-20 20:11:47 (GMT)
commit5ed622b9ca432f1b440e8903680695ac83e28301 (patch)
tree27aa293f46eefbad7c00a0f7738075cdbc401068 /test
parentb17aea2338325f02317d42bce0d534374b288bca (diff)
downloadhdf5-5ed622b9ca432f1b440e8903680695ac83e28301.zip
hdf5-5ed622b9ca432f1b440e8903680695ac83e28301.tar.gz
hdf5-5ed622b9ca432f1b440e8903680695ac83e28301.tar.bz2
The cache_image test shows a skipped message about EoC in parallel.
Diffstat (limited to 'test')
-rw-r--r--test/cache_image.c18
-rw-r--r--test/evict_on_close.c1
2 files changed, 9 insertions, 10 deletions
diff --git a/test/cache_image.c b/test/cache_image.c
index 31d7705..378c21e 100644
--- a/test/cache_image.c
+++ b/test/cache_image.c
@@ -62,10 +62,7 @@ static unsigned cache_image_api_error_check_3(void);
static unsigned cache_image_api_error_check_4(void);
static unsigned get_free_sections_test(void);
-
-#ifndef H5_HAVE_PARALLEL
static unsigned evict_on_close_test(void);
-#endif /* H5_HAVE_PARALLEL */
/****************************************************************************/
@@ -7714,10 +7711,10 @@ get_free_sections_test(void)
*
*-------------------------------------------------------------------------
*/
-#ifndef H5_HAVE_PARALLEL
static unsigned
evict_on_close_test(void)
{
+#ifndef H5_HAVE_PARALLEL
const char * fcn_name = "evict_on_close_test()";
char filename[512];
hbool_t show_progress = FALSE;
@@ -7726,9 +7723,16 @@ evict_on_close_test(void)
H5F_t *file_ptr = NULL;
H5C_t *cache_ptr = NULL;
int cp = 0;
+#endif /* H5_HAVE_PARALLEL */
TESTING("Cache image / evict on close interaction");
+#ifdef H5_HAVE_PARALLEL
+ SKIPPED();
+ HDputs(" EoC not supported in the parallel library.");
+ return 0;
+#else
+
pass = TRUE;
if ( show_progress )
@@ -8017,9 +8021,9 @@ evict_on_close_test(void)
FUNC, failure_mssg);
return !pass;
+#endif /* H5_HAVE_PARALLEL */
} /* evict_on_close_test() */
-#endif /* H5_HAVE_PARALLEL */
/*-------------------------------------------------------------------------
@@ -8071,13 +8075,9 @@ main(void)
nerrs += cache_image_api_error_check_4();
nerrs += get_free_sections_test();
-
-#ifndef H5_HAVE_PARALLEL
nerrs += evict_on_close_test();
-#endif /* H5_HAVE_PARALLEL */
return(nerrs > 0);
} /* main() */
-
diff --git a/test/evict_on_close.c b/test/evict_on_close.c
index 8196ea1..147976b 100644
--- a/test/evict_on_close.c
+++ b/test/evict_on_close.c
@@ -808,7 +808,6 @@ error:
} /* check_dset_scheme() */
-
/*-------------------------------------------------------------------------
* Function: check_evict_on_close_api()