diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2005-06-08 04:44:19 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2005-06-08 04:44:19 (GMT) |
| commit | 3a857b6d19d719e45435b3fedc31a49570d4af09 (patch) | |
| tree | 2f4b37abb7749398116dd82914c63db699089f88 /test/file_handle.c | |
| parent | 4ee93b78c45f1641c527c0a02f289d4a8d001282 (diff) | |
| download | hdf5-3a857b6d19d719e45435b3fedc31a49570d4af09.zip hdf5-3a857b6d19d719e45435b3fedc31a49570d4af09.tar.gz hdf5-3a857b6d19d719e45435b3fedc31a49570d4af09.tar.bz2 | |
[svn-r10874] Purpose:
Bug fix
Description:
Tweaks to make new family file compatibility tests work in non-srcdir
(i.e. "inplace") builds.
Platforms tested:
FreeBSD 4.11 (sleipnir) w & w/o srcdir
Too minor to require h5committest
Diffstat (limited to 'test/file_handle.c')
| -rw-r--r-- | test/file_handle.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/test/file_handle.c b/test/file_handle.c index b957b15..a18c8e6 100644 --- a/test/file_handle.c +++ b/test/file_handle.c @@ -33,9 +33,10 @@ const char *FILENAME[] = { "core_file", "family_file", "multi_file", - "family_v1.7_", NULL }; + +#define COMPAT_BASENAME "family_v1.7_" /*------------------------------------------------------------------------- @@ -372,7 +373,7 @@ test_family_compat(void) if(H5Pset_fapl_family(fapl, (hsize_t)FAMILY_SIZE2, H5P_DEFAULT)<0) goto error; - h5_fixname(FILENAME[4], fapl, filename, sizeof filename); + h5_fixname(COMPAT_BASENAME, fapl, filename, sizeof filename); /* Generate correct name for test file by prepending the source path */ if(srcdir && ((strlen(srcdir) + strlen(filename) + 1) < sizeof(pathname))) { @@ -387,9 +388,7 @@ test_family_compat(void) if(H5Fclose(file)<0) goto error; - if(H5Pclose(fapl)<0) - goto error; - + h5_cleanup(FILENAME, fapl); PASSED(); return 0; |