summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Laird <jlaird@hdfgroup.org>2007-02-19 15:05:42 (GMT)
committerJames Laird <jlaird@hdfgroup.org>2007-02-19 15:05:42 (GMT)
commit23eaf259ae6acb351e8b352ec7dd271ca9fd6965 (patch)
tree13ffe06b4f275cdb8acd48fb023116f76025efab
parente10c553522e30344e069ac60bbc12e98851f26c7 (diff)
downloadhdf5-23eaf259ae6acb351e8b352ec7dd271ca9fd6965.zip
hdf5-23eaf259ae6acb351e8b352ec7dd271ca9fd6965.tar.gz
hdf5-23eaf259ae6acb351e8b352ec7dd271ca9fd6965.tar.bz2
[svn-r13330] Added HDF5TestExpress functionality to tsohm.c. This may fix the bug that
sol's been having. When Express Testing (level 2 or 3) is enabled, the test will no longer repeatedly close and re-open a file, which should work better under AFS. Tested on kagiso (extremely minor change, no new code introduced).
-rw-r--r--test/tsohm.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/test/tsohm.c b/test/tsohm.c
index 3ebeccc..a8008bc 100644
--- a/test/tsohm.c
+++ b/test/tsohm.c
@@ -572,6 +572,12 @@ size1_helper(hid_t file, const char* filename, int test_file_closing)
hsize_t dim1[1];
int x;
+ /* Closing and re-opening the file takes a long time on systems without
+ * local disks. Don't close and reopen if express testing is enabled.
+ */
+ if(GetTestExpress() > 1)
+ test_file_closing = 0;
+
/* Intialize rdata */
strcpy(rdata.str, "\0");
@@ -1366,6 +1372,12 @@ size2_helper(hid_t fcpl_id, int test_file_closing)
dtype1_struct fill1;
char fill2[DTYPE2_SIZE];
+ /* Closing and re-opening the file takes a long time on systems without
+ * local disks. Don't close and reopen if express testing is enabled.
+ */
+ if(GetTestExpress() > 1)
+ test_file_closing = 0;
+
/* Create a file and get its size */
file_id = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl_id, H5P_DEFAULT);
CHECK_I(file_id, "H5Fcreate");