From 59e9037d38a7c9934f9c6ae7f89320ca8f359443 Mon Sep 17 00:00:00 2001 From: James Laird Date: Thu, 3 Aug 2006 12:58:06 -0500 Subject: [svn-r12530] Skipped objcopy and links tests when certain file drivers are used. --- test/links.c | 2 +- test/objcopy.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/links.c b/test/links.c index 68954ca..27449c8 100644 --- a/test/links.c +++ b/test/links.c @@ -4714,7 +4714,7 @@ main(void) envval = HDgetenv("HDF5_DRIVER"); if (envval == NULL) envval = "nomatch"; - if (HDstrcmp(envval, "core") && HDstrcmp(envval, "split")) { + if (HDstrcmp(envval, "core") && HDstrcmp(envval, "split") && HDstrcmp(envval, "multi") && HDstrcmp(envval, "family")) { h5_reset(); fapl = h5_fileaccess(); /* The tests... */ diff --git a/test/objcopy.c b/test/objcopy.c index 7efef50..94281fd 100755 --- a/test/objcopy.c +++ b/test/objcopy.c @@ -4652,14 +4652,13 @@ test_copy_ext_link(hid_t fapl) /* close the group */ if ( H5Gclose(gid) < 0) TEST_ERROR; - /* create file to hold external links to the src file */ if ( (fid_ext = H5Fcreate(ext_filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR; - /* create group in the external file */ + /* create group in the file that will hold the external link */ if ( (gid = H5Gcreate(fid_ext, NAME_GROUP_LINK, (size_t)0)) < 0) TEST_ERROR; - /* Create an external link to the dataset */ + /* Create an external link to the dataset in the source file */ if ( H5Lcreate_external(src_filename, NAME_LINK_DATASET, fid_ext, NAME_LINK_EXTERN, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR; /* close the group and file */ @@ -6517,7 +6516,8 @@ main(void) envval = HDgetenv("HDF5_DRIVER"); if (envval == NULL) envval = "nomatch"; - if (HDstrcmp(envval, "core") && HDstrcmp(envval, "split") && HDstrcmp(envval, "multi")) { + + if (HDstrcmp(envval, "stdio") && HDstrcmp(envval, "core") && HDstrcmp(envval, "split") && HDstrcmp(envval, "multi") && HDstrcmp(envval, "family")) { /* Setup */ h5_reset(); fapl = h5_fileaccess(); -- cgit v0.12