diff options
| author | Elena Pourmal <epourmal@hdfgroup.org> | 2006-09-11 23:18:29 (GMT) |
|---|---|---|
| committer | Elena Pourmal <epourmal@hdfgroup.org> | 2006-09-11 23:18:29 (GMT) |
| commit | 298dbe539616ee11eaae3568c9fb1982027636f9 (patch) | |
| tree | 37ea41c24ea153554001e315a6cc54544ebca495 | |
| parent | f546cc8972285b1f6b8fd6c56492f780cb84eac3 (diff) | |
| download | hdf5-298dbe539616ee11eaae3568c9fb1982027636f9.zip hdf5-298dbe539616ee11eaae3568c9fb1982027636f9.tar.gz hdf5-298dbe539616ee11eaae3568c9fb1982027636f9.tar.bz2 | |
[svn-r12659] This is VMS maintenance check-in.
Some of the tests cannot be run on VMS since they try to open
the same file twice.
Solution:
Bypass the tests according to the H5_CANNOT_OPEN_TWICE variable setting.
Platforms tested:
VMS server and heping.
| -rw-r--r-- | test/links.c | 7 | ||||
| -rwxr-xr-x | test/objcopy.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/test/links.c b/test/links.c index 0321ded..1825214 100644 --- a/test/links.c +++ b/test/links.c @@ -5070,15 +5070,18 @@ main(void) nerrors += test_move_preserves(fapl); #endif nerrors += test_compat(fapl); - +#ifndef H5_CANNOT_OPEN_TWICE nerrors += external_link_root(fapl) < 0 ? 1 : 0; +#endif /* H5_CANNOT_OPEN_TWICE */ nerrors += external_link_path(fapl) < 0 ? 1 : 0; nerrors += external_link_mult(fapl) < 0 ? 1 : 0; #ifdef H5_GROUP_REVISION nerrors += external_link_self(fapl) < 0 ? 1 : 0; #endif +#ifndef H5_CANNOT_OPEN_TWICE nerrors += external_link_pingpong(fapl) < 0 ? 1 : 0; nerrors += external_link_toomany(fapl) < 0 ? 1 : 0; +#endif /* H5_CANNOT_OPEN_TWICE */ nerrors += external_link_dangling(fapl) < 0 ? 1 : 0; nerrors += external_link_recursive(fapl) < 0 ? 1 : 0; nerrors += external_link_query(fapl) < 0 ? 1 : 0; @@ -5090,7 +5093,9 @@ main(void) #ifdef H5_GROUP_REVISION nerrors += external_link_ride(fapl) < 0 ? 1 : 0; #endif /* H5_GROUP_REVISION */ +#ifndef H5_CANNOT_OPEN_TWICE nerrors += external_link_closing(fapl) < 0 ? 1 : 0; +#endif /* H5_CANNOT_OPEN_TWICE */ nerrors += external_link_endian(fapl) < 0 ? 1 : 0; /* These tests assume that external links are a form of UD links, diff --git a/test/objcopy.c b/test/objcopy.c index 94281fd..3ac25e5 100755 --- a/test/objcopy.c +++ b/test/objcopy.c @@ -6560,7 +6560,9 @@ main(void) nerrors += test_copy_group_wide_loop(fapl); nerrors += test_copy_group_links(fapl); nerrors += test_copy_soft_link(fapl); +#ifndef H5_CANNOT_OPEN_TWICE nerrors += test_copy_ext_link(fapl); +#endif /* H5_CANNOT_OPEN_TWICE */ nerrors += test_copy_exist(fapl); nerrors += test_copy_path(fapl); nerrors += test_copy_same_file_named_datatype(fapl); |