summaryrefslogtreecommitdiffstats
path: root/test/cache_image.c
diff options
context:
space:
mode:
authorDavid Young <dyoung@hdfgroup.org>2020-03-31 18:13:39 (GMT)
committerDavid Young <dyoung@hdfgroup.org>2020-03-31 18:13:39 (GMT)
commit69fcb52eca6ec15f366c069fb9beb29190d58ba1 (patch)
tree22f4cc0752bf362e75d4e99b7c134bb4b3e25531 /test/cache_image.c
parent817756a0e0a84a376e3c399f13ff495fde7a10a4 (diff)
downloadhdf5-69fcb52eca6ec15f366c069fb9beb29190d58ba1.zip
hdf5-69fcb52eca6ec15f366c069fb9beb29190d58ba1.tar.gz
hdf5-69fcb52eca6ec15f366c069fb9beb29190d58ba1.tar.bz2
Prepare for reuse in vfd_swmr_zoo_{reader,writer}: in
validate_zoo()/check_zoo(), instead of checking/modifying the global variable `pass`, just return `false` on failure, `true` on success. Update test `cache_image` to match.
Diffstat (limited to 'test/cache_image.c')
-rw-r--r--test/cache_image.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/test/cache_image.c b/test/cache_image.c
index d3ade5c..8e8c1e7 100644
--- a/test/cache_image.c
+++ b/test/cache_image.c
@@ -4820,7 +4820,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd)
/* 3) Construct a "zoo" in the above group, and validate it. */
if ( pass )
- create_zoo(file_id, process_group_name, min_group, false);
+ pass = create_zoo(file_id, process_group_name, min_group, false);
#if H5C_COLLECT_CACHE_STATS
if ( pass ) {
@@ -4892,7 +4892,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd)
/* 6) Validate the "zoo" created in the previous file open. */
if ( pass )
- validate_zoo(file_id, process_group_name, max_group, false);
+ pass = validate_zoo(file_id, process_group_name, max_group, false);
#if H5C_COLLECT_CACHE_STATS
if ( pass ) {
@@ -4933,7 +4933,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd)
/* 8) Construct a "zoo" in the above group, and validate it. */
if ( pass )
- create_zoo(file_id, process_group_name, max_group, false);
+ pass = create_zoo(file_id, process_group_name, max_group, false);
if ( show_progress )
HDfprintf(stdout, "%s:L4 cp = %d, max_group = %d, pass = %d.\n",
@@ -4994,7 +4994,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd)
i = min_group;
while(pass && i <= max_group) {
HDsprintf(process_group_name, "/process_%d", i);
- validate_zoo(file_id, process_group_name, i++, false);
+ pass = validate_zoo(file_id, process_group_name, i++, false);
}
#if H5C_COLLECT_CACHE_STATS
@@ -5047,7 +5047,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd)
while ( ( pass ) && ( i <= max_group ) ) {
HDsprintf(process_group_name, "/process_%d", i);
- validate_zoo(file_id, process_group_name, i++, false);
+ pass = validate_zoo(file_id, process_group_name, i++, false);
}
#if H5C_COLLECT_CACHE_STATS
@@ -5111,7 +5111,7 @@ cache_image_smoke_check_5(hbool_t single_file_vfd)
i = min_group;
while ( ( pass ) && ( i <= max_group ) ) {
HDsprintf(process_group_name, "/process_%d", i);
- validate_zoo(file_id, process_group_name, i++, false);
+ pass = validate_zoo(file_id, process_group_name, i++, false);
}
#if H5C_COLLECT_CACHE_STATS