summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2009-06-11 13:32:45 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2009-06-11 13:32:45 (GMT)
commiteda3b5015f7e5822c72423b66861653bca1d93bc (patch)
treea10d9a5b882eef75149e2cd78fb35520b152d616
parent19e0ec17dd066748a739ecb9ac4cd584479ea92c (diff)
downloadhdf5-eda3b5015f7e5822c72423b66861653bca1d93bc.zip
hdf5-eda3b5015f7e5822c72423b66861653bca1d93bc.tar.gz
hdf5-eda3b5015f7e5822c72423b66861653bca1d93bc.tar.bz2
[svn-r17030] Description:
Revert my reversion of the change to not run the 'temporary' file space test with the family VFD. (How's that for a checkin message :-) Tested on: Linux/32 2.6 (jam)
-rw-r--r--test/mf.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/test/mf.c b/test/mf.c
index 164427c..4259520 100644
--- a/test/mf.c
+++ b/test/mf.c
@@ -742,15 +742,11 @@ static unsigned
test_mf_tmp(const char *env_h5_drvr, hid_t fapl)
{
hid_t file = -1; /* File ID */
- hbool_t contig_addr_vfd; /* Whether VFD used has a contigous address space */
TESTING("'temporary' file space allocation");
- /* Skip test when using VFDs that has different address spaces for each
- * type of metadata allocation.
- */
- contig_addr_vfd = (hbool_t)(HDstrcmp(env_h5_drvr, "split") && HDstrcmp(env_h5_drvr, "multi"));
- if(contig_addr_vfd) {
+ /* Can't run this test with multi-file VFDs */
+ if(HDstrcmp(env_h5_drvr, "split") && HDstrcmp(env_h5_drvr, "multi") && HDstrcmp(env_h5_drvr, "family")) {
char filename[FILENAME_LEN]; /* Filename to use */
H5F_t *f = NULL; /* Internal file object pointer */
h5_stat_size_t file_size, new_file_size; /* file size */