From c8a9a305cc9ce0b3f7e7964c2fd73ef3bf4dc535 Mon Sep 17 00:00:00 2001 From: Leon Arber Date: Fri, 29 Sep 2006 17:01:07 -0500 Subject: [svn-r12696] Purpose: Add Feature Description: Add a second test case to the serial flush tests. This tests the case when the file is not flushed out to disk and verifies that it fails as expected. Platforms: Linux (heping) --- test/flush1.c | 109 +++++++++++++++++++++++++++++-------------- test/flush2.c | 147 ++++++++++++++++++++++++++++++++++++++++------------------ 2 files changed, 174 insertions(+), 82 deletions(-) diff --git a/test/flush1.c b/test/flush1.c index 1fd3ca7..f6c99c3 100644 --- a/test/flush1.c +++ b/test/flush1.c @@ -26,12 +26,73 @@ const char *FILENAME[] = { "flush", + "noflush", NULL }; static double the_data[100][100]; - +/*------------------------------------------------------------------------- + * Function: create_file + * + * Purpose: Creates file used in part 1 of the test + * + * Return: Success: 0 + * + * Failure: 1 + * + * Programmer: Leon Arber + * Sept. 26, 2006 + * + * Modifications: + * + *------------------------------------------------------------------------- + */ +hid_t create_file(char* name, hid_t fapl) +{ + hid_t file, dcpl, space, dset, groups, grp; + hsize_t ds_size[2] = {100, 100}; + hsize_t ch_size[2] = {5, 5}; + hsize_t i, j; + + if ((file=H5Fcreate(name, H5F_ACC_TRUNC, H5P_DEFAULT, fapl))<0) goto error; + + /* Create a chunked dataset */ + if ((dcpl=H5Pcreate(H5P_DATASET_CREATE))<0) goto error; + if (H5Pset_chunk(dcpl, 2, ch_size)<0) goto error; + if ((space=H5Screate_simple(2, ds_size, NULL))<0) goto error; + if ((dset=H5Dcreate(file, "dset", H5T_NATIVE_FLOAT, space, H5P_DEFAULT))<0) + goto error; + + /* Write some data */ + for (i=0; i0.0001) { + H5_FAILED(); + printf(" dset[%lu][%lu] = %g\n", + (unsigned long)i, (unsigned long)j, the_data[i][j]); + printf(" should be %g\n", + (double)(hssize_t)i/(hssize_t)(j+1)); + goto error; + } + } + } + + /* Open some groups */ + if ((groups=H5Gopen(file, "some_groups"))<0) goto error; + for (i=0; i<100; i++) { + sprintf(name, "grp%02u", (unsigned)i); + if ((grp=H5Gopen(groups, name))<0) goto error; + if (H5Gclose(grp)<0) goto error; + } + + if (H5Gclose(groups)<0) goto error; + if (H5Dclose(dset)<0) goto error; + if (H5Fclose(file)<0) goto error; + return 0; +error: + return 1; + + +} + /*------------------------------------------------------------------------- * Function: main * - * Purpose: Part 1 of a two-part H5Fflush() test. + * Purpose: Part 2 of a two-part H5Fflush() test. * * Return: Success: 0 * @@ -44,72 +114,57 @@ static double the_data[100][100]; * Friday, October 23, 1998 * * Modifications: + * Leon Arber + * Sept. 26, 2006, expand to check for case where the was file not flushed. * *------------------------------------------------------------------------- */ int main(void) { - hid_t fapl, file, space, dset, groups, grp; - hsize_t ds_size[2]; - double error; - hsize_t i, j; + hid_t fapl; + H5E_auto_stack_t func; + char name[1024]; const char *envval = NULL; h5_reset(); fapl = h5_fileaccess(); - TESTING("H5Fflush (part2)"); + TESTING("H5Fflush (part2 with flush)"); /* Don't run this test using the core or split file drivers */ envval = HDgetenv("HDF5_DRIVER"); if (envval == NULL) envval = "nomatch"; if (HDstrcmp(envval, "core") && HDstrcmp(envval, "split")) { - /* Open the file */ + /* Check the case where the file was flushed */ h5_fixname(FILENAME[0], fapl, name, sizeof name); - if ((file=H5Fopen(name, H5F_ACC_RDONLY, fapl))<0) goto error; - - /* Open the dataset */ - if ((dset=H5Dopen(file, "dset"))<0) goto error; - if ((space=H5Dget_space(dset))<0) goto error; - if (H5Sget_simple_extent_dims(space, ds_size, NULL)<0) goto error; - assert(100==ds_size[0] && 100==ds_size[1]); - - /* Read some data */ - if (H5Dread(dset, H5T_NATIVE_DOUBLE, space, space, H5P_DEFAULT, - the_data)<0) goto error; - for (i=0; i0.0001) { - H5_FAILED(); - printf(" dset[%lu][%lu] = %g\n", - (unsigned long)i, (unsigned long)j, the_data[i][j]); - printf(" should be %g\n", - (double)(hssize_t)i/(hssize_t)(j+1)); - goto error; - } - } + if(check_file(name, fapl)) + { + H5_FAILED() + goto error; } + else + PASSED(); + + + /* Check the case where the file was not flushed. This should give an error + * so we turn off the error stack temporarily */ + TESTING("H5Fflush (part2 without flush)"); + H5Eget_auto_stack(H5E_DEFAULT,&func,NULL); + H5Eset_auto_stack(H5E_DEFAULT, NULL, NULL); - /* Open some groups */ - if ((groups=H5Gopen(file, "some_groups"))<0) goto error; - for (i=0; i<100; i++) { - sprintf(name, "grp%02u", (unsigned)i); - if ((grp=H5Gopen(groups, name))<0) goto error; - if (H5Gclose(grp)<0) goto error; + h5_fixname(FILENAME[1], fapl, name, sizeof name); + if(check_file(name, fapl)) + PASSED() + else + { + H5_FAILED() + goto error; } + H5Eset_auto_stack(H5E_DEFAULT, func, NULL); + - if (H5Gclose(groups)<0) goto error; - if (H5Dclose(dset)<0) goto error; - if (H5Fclose(file)<0) goto error; - PASSED(); h5_cleanup(FILENAME, fapl); } else -- cgit v0.12