summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond Lu <songyulu@hdfgroup.org>2007-02-08 19:52:10 (GMT)
committerRaymond Lu <songyulu@hdfgroup.org>2007-02-08 19:52:10 (GMT)
commit487d82bf58a1a8795343512c17a8b5a8428bdcd9 (patch)
tree7b4dd674ff00780e74d32da45ec6b9f30b266af2
parent494f46639dfdd646cb54235ef9d8a3b0cf75523c (diff)
downloadhdf5-487d82bf58a1a8795343512c17a8b5a8428bdcd9.zip
hdf5-487d82bf58a1a8795343512c17a8b5a8428bdcd9.tar.gz
hdf5-487d82bf58a1a8795343512c17a8b5a8428bdcd9.tar.bz2
[svn-r13273] The function test_copy_group_deep takes too long on copper when tested with Direct driver.
Added the express mode check and driver check to it. Skip it if the express mode is greater than 1 and the driver is "direct."
-rwxr-xr-xtest/objcopy.c17
1 files changed, 15 insertions, 2 deletions
diff --git a/test/objcopy.c b/test/objcopy.c
index 1d9569a..819ca70 100755
--- a/test/objcopy.c
+++ b/test/objcopy.c
@@ -4441,7 +4441,7 @@ test_copy_group_deep(hid_t fcpl_src, hid_t fcpl_dst, hid_t fapl)
char objname[NAME_BUF_SIZE]; /* Sub-group & dataset name buffer */
char src_filename[NAME_BUF_SIZE];
char dst_filename[NAME_BUF_SIZE];
-
+
TESTING("H5Ocopy(): deep nested groups");
/* set initial data values */
@@ -7078,11 +7078,16 @@ main(void)
hid_t fapl, fapl2;
hid_t fcpl_shared;
int configuration; /* Configuration of tests. */
+ int ExpressMode;
/* Setup */
h5_reset();
fapl = h5_fileaccess();
+ ExpressMode = GetTestExpress();
+ if (ExpressMode > 1)
+ printf("***Express test mode on. Some tests may be skipped\n");
+
/* Copy the file access property list */
if((fapl2 = H5Pcopy(fapl)) < 0) TEST_ERROR
@@ -7163,7 +7168,15 @@ main(void)
nerrors += test_copy_group_empty(fcpl_src, fcpl_dst, my_fapl);
nerrors += test_copy_root_group(fcpl_src, fcpl_dst, my_fapl);
nerrors += test_copy_group(fcpl_src, fcpl_dst, my_fapl);
- nerrors += test_copy_group_deep(fcpl_src, fcpl_dst, my_fapl);
+ if (ExpressMode > 1 && !HDstrcmp(envval, "direct")) {
+ /* This test case with Direct driver has a poor performance on
+ * NCSA copper, though it works. Skip it for now and worry
+ * about the performance later.
+ */
+ printf("***Express test mode on. test_copy_group_deep is skipped");
+ SKIPPED();
+ } else
+ nerrors += test_copy_group_deep(fcpl_src, fcpl_dst, my_fapl);
nerrors += test_copy_group_loop(fcpl_src, fcpl_dst, my_fapl);
nerrors += test_copy_group_wide_loop(fcpl_src, fcpl_dst, my_fapl);
nerrors += test_copy_group_links(fcpl_src, fcpl_dst, my_fapl);