diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2007-06-15 19:11:59 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-06-15 19:11:59 (GMT) |
commit | d0a9cf9ffaf0d62d8e793f4a89189a7a01eda7f5 (patch) | |
tree | 288c1956e2d23398652b07b76e3fb3c081b09888 /test/getname.c | |
parent | 40160d4d740ff706520b396fd9367089e8e4e2a2 (diff) | |
download | hdf5-d0a9cf9ffaf0d62d8e793f4a89189a7a01eda7f5.zip hdf5-d0a9cf9ffaf0d62d8e793f4a89189a7a01eda7f5.tar.gz hdf5-d0a9cf9ffaf0d62d8e793f4a89189a7a01eda7f5.tar.bz2 |
[svn-r13871] Description:
Fix problems with 'check-vfd' target, that were [mostly] introduced with
the recent "unique, but sharable" ISOHM optimization.
The problems were mostly with using the 'core' VFD, so the
H5Pset_fapl_core() API call was changed to re-open existing files (therefore
operating more list the sec2, stdio, etc. VFDs). This allows many more of
the tests to run using the 'core' VFD, so those were enabled also.
Tested on:
Linux/64 2.6 (chicago2) w/check-vfd
Diffstat (limited to 'test/getname.c')
-rw-r--r-- | test/getname.c | 61 |
1 files changed, 25 insertions, 36 deletions
diff --git a/test/getname.c b/test/getname.c index a429ed4..5fa673b 100644 --- a/test/getname.c +++ b/test/getname.c @@ -2791,44 +2791,33 @@ int main(void) { hid_t file_id = (-1); - const char *envval; - - envval = HDgetenv("HDF5_DRIVER"); - if(envval == NULL) - envval = "nomatch"; - /* Does work with core driver. */ - if(HDstrcmp(envval, "core")==0) { - printf("All getname tests skipped - " - "Incompatible with current Virtual File Driver(%s)\n", envval); - }else{ - int nerrors = 0; - hid_t fapl; - char filename0[1024]; - - /* Reset the library and get the file access property list */ - h5_reset(); - fapl = h5_fileaccess(); - h5_fixname(FILENAME[0], fapl, filename0, sizeof filename0); - - /* Create a new file_id using default create property but vfd access - * property. - */ - if((file_id = H5Fcreate(filename0,H5F_ACC_TRUNC, H5P_DEFAULT, fapl )) < 0) TEST_ERROR - - /* Call "main" test routine */ - nerrors += test_main(file_id, fapl); - nerrors += test_obj_ref(fapl); - nerrors += test_reg_ref(fapl); - - /* Close file */ - H5Fclose(file_id); + int nerrors = 0; + hid_t fapl; + char filename0[1024]; + + /* Reset the library and get the file access property list */ + h5_reset(); + fapl = h5_fileaccess(); + h5_fixname(FILENAME[0], fapl, filename0, sizeof filename0); + + /* Create a new file_id using default create property but vfd access + * property. + */ + if((file_id = H5Fcreate(filename0,H5F_ACC_TRUNC, H5P_DEFAULT, fapl )) < 0) TEST_ERROR + + /* Call "main" test routine */ + nerrors += test_main(file_id, fapl); + nerrors += test_obj_ref(fapl); + nerrors += test_reg_ref(fapl); + + /* Close file */ + H5Fclose(file_id); - if(nerrors) - goto error; - puts("All getname tests passed."); + if(nerrors) + goto error; + puts("All getname tests passed."); - h5_cleanup(FILENAME, fapl); - } /* end if */ + h5_cleanup(FILENAME, fapl); return 0; |