mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-27 02:10:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

The cache_image test shows a skipped message about EoC in parallel.

Browse Source
This commit is contained in:
Dana Robinson 2017-04-20 16:11:47 -04:00
parent b17aea2338
commit 5ed622b9ca
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/H5Pfapl.c
View File

@ -4401,7 +4401,6 @@ H5Pset_evict_on_close(
FUNC_ENTER_API(FAIL)
H5TRACE2("e", "ib", fapl_id, evict_on_close);
/* Compare the property list's class against the other class */
if(TRUE != H5P_isa_class(fapl_id, H5P_FILE_ACCESS))
HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "property list is not a file access plist")

18
test/cache_image.c
View File

@ -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() */

1
test/evict_on_close.c
View File

@ -808,7 +808,6 @@ error:
} /* check_dset_scheme() */
/*-------------------------------------------------------------------------
* Function: check_evict_on_close_api()