diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2017-04-20 20:11:47 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2017-04-20 20:59:05 (GMT) |
| commit | cbab16c8f2767de8f8786a85903e0c4299abe99f (patch) | |
| tree | 5cfde004b87bccc97b1d1590c68cc409cf050767 /test/cache_image.c | |
| parent | 2b936c79e24e292470f135ac50161349077e8f93 (diff) | |
| download | hdf5-cbab16c8f2767de8f8786a85903e0c4299abe99f.zip hdf5-cbab16c8f2767de8f8786a85903e0c4299abe99f.tar.gz hdf5-cbab16c8f2767de8f8786a85903e0c4299abe99f.tar.bz2 | |
The cache_image test shows a skipped message about EoC in parallel.
Diffstat (limited to 'test/cache_image.c')
| -rw-r--r-- | test/cache_image.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/test/cache_image.c b/test/cache_image.c index c8f1e82..58b0b8f 100644 --- a/test/cache_image.c +++ b/test/cache_image.c @@ -60,10 +60,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 */ /****************************************************************************/ @@ -7712,10 +7709,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; @@ -7724,9 +7721,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 ) @@ -8015,9 +8019,9 @@ evict_on_close_test(void) FUNC, failure_mssg); return !pass; +#endif /* H5_HAVE_PARALLEL */ } /* evict_on_close_test() */ -#endif /* H5_HAVE_PARALLEL */ /*------------------------------------------------------------------------- @@ -8069,13 +8073,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() */ - |