summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@lbl.gov>2018-12-20 21:45:11 (GMT)
committerQuincey Koziol <koziol@lbl.gov>2018-12-20 21:45:11 (GMT)
commit830fac2fea7fe27892299400d6892e96f216a97b (patch)
treee1b219f98782421726d08263350643913b0c208b
parent416f68c6709c9dd47620e89ac6c3a911e77e8b17 (diff)
parent9e8cacaa5531f418f5d9d447c1251eb705da785a (diff)
downloadhdf5-830fac2fea7fe27892299400d6892e96f216a97b.zip
hdf5-830fac2fea7fe27892299400d6892e96f216a97b.tar.gz
hdf5-830fac2fea7fe27892299400d6892e96f216a97b.tar.bz2
Merge pull request #1402 in HDFFV/hdf5 from stackable_vol_fix_13 to develop
* commit '9e8cacaa5531f418f5d9d447c1251eb705da785a': Remove core VFD-specific property list call and regenerate encoded property lists.
-rw-r--r--test/gen_plist.c5
-rw-r--r--test/testfiles/plist_files/def_fapl_32bebin1652 -> 1651 bytes
-rw-r--r--test/testfiles/plist_files/def_fapl_32lebin1652 -> 1651 bytes
-rw-r--r--test/testfiles/plist_files/def_fapl_64bebin1652 -> 1651 bytes
-rw-r--r--test/testfiles/plist_files/def_fapl_64lebin1652 -> 1651 bytes
-rw-r--r--test/testfiles/plist_files/fapl_32bebin1654 -> 1653 bytes
-rw-r--r--test/testfiles/plist_files/fapl_32lebin1654 -> 1653 bytes
-rw-r--r--test/testfiles/plist_files/fapl_64bebin1654 -> 1653 bytes
-rw-r--r--test/testfiles/plist_files/fapl_64lebin1654 -> 1653 bytes
-rw-r--r--test/testfiles/plist_files/lapl_32bebin1757 -> 1756 bytes
-rw-r--r--test/testfiles/plist_files/lapl_32lebin1757 -> 1756 bytes
-rw-r--r--test/testfiles/plist_files/lapl_64bebin1757 -> 1756 bytes
-rw-r--r--test/testfiles/plist_files/lapl_64lebin1757 -> 1756 bytes
13 files changed, 1 insertions, 4 deletions
diff --git a/test/gen_plist.c b/test/gen_plist.c
index 62693bd..af248be 100644
--- a/test/gen_plist.c
+++ b/test/gen_plist.c
@@ -363,9 +363,6 @@ main(void)
if((ret = H5Pset_mdc_image_config(fapl1, &my_cache_image_config)) < 0)
assert(ret > 0);
- if((ret = H5Pset_core_write_tracking(fapl1, TRUE, (size_t)(1024 * 1024))) < 0)
- assert(ret > 0);
-
if((ret = encode_plist(fapl1, little_endian, word_length, "testfiles/plist_files/fapl_")) < 0)
assert(ret > 0);
@@ -476,7 +473,7 @@ encode_plist(hid_t plist_id, int little_endian, int word_length, const char *fil
HDassert(ret > 0);
fd = HDopen(filename, O_RDWR | O_CREAT | O_TRUNC, H5_POSIX_CREATE_MODE_RW);
- HDassert(fd > 0);
+ HDassert(fd >= 0);
write_size = HDwrite(fd, temp_buf, temp_size);
HDassert(write_size == (ssize_t)temp_size);
diff --git a/test/testfiles/plist_files/def_fapl_32be b/test/testfiles/plist_files/def_fapl_32be
index cd8a33a..53ef572 100644
--- a/test/testfiles/plist_files/def_fapl_32be
+++ b/test/testfiles/plist_files/def_fapl_32be
Binary files differ
diff --git a/test/testfiles/plist_files/def_fapl_32le b/test/testfiles/plist_files/def_fapl_32le
index cd8a33a..53ef572 100644
--- a/test/testfiles/plist_files/def_fapl_32le
+++ b/test/testfiles/plist_files/def_fapl_32le
Binary files differ
diff --git a/test/testfiles/plist_files/def_fapl_64be b/test/testfiles/plist_files/def_fapl_64be
index cd8a33a..53ef572 100644
--- a/test/testfiles/plist_files/def_fapl_64be
+++ b/test/testfiles/plist_files/def_fapl_64be
Binary files differ
diff --git a/test/testfiles/plist_files/def_fapl_64le b/test/testfiles/plist_files/def_fapl_64le
index cd8a33a..53ef572 100644
--- a/test/testfiles/plist_files/def_fapl_64le
+++ b/test/testfiles/plist_files/def_fapl_64le
Binary files differ
diff --git a/test/testfiles/plist_files/fapl_32be b/test/testfiles/plist_files/fapl_32be
index b0ad12e..d89a44c 100644
--- a/test/testfiles/plist_files/fapl_32be
+++ b/test/testfiles/plist_files/fapl_32be
Binary files differ
diff --git a/test/testfiles/plist_files/fapl_32le b/test/testfiles/plist_files/fapl_32le
index b0ad12e..d89a44c 100644
--- a/test/testfiles/plist_files/fapl_32le
+++ b/test/testfiles/plist_files/fapl_32le
Binary files differ
diff --git a/test/testfiles/plist_files/fapl_64be b/test/testfiles/plist_files/fapl_64be
index b0ad12e..d89a44c 100644
--- a/test/testfiles/plist_files/fapl_64be
+++ b/test/testfiles/plist_files/fapl_64be
Binary files differ
diff --git a/test/testfiles/plist_files/fapl_64le b/test/testfiles/plist_files/fapl_64le
index b0ad12e..d89a44c 100644
--- a/test/testfiles/plist_files/fapl_64le
+++ b/test/testfiles/plist_files/fapl_64le
Binary files differ
diff --git a/test/testfiles/plist_files/lapl_32be b/test/testfiles/plist_files/lapl_32be
index f93e19a..eee238e 100644
--- a/test/testfiles/plist_files/lapl_32be
+++ b/test/testfiles/plist_files/lapl_32be
Binary files differ
diff --git a/test/testfiles/plist_files/lapl_32le b/test/testfiles/plist_files/lapl_32le
index f93e19a..eee238e 100644
--- a/test/testfiles/plist_files/lapl_32le
+++ b/test/testfiles/plist_files/lapl_32le
Binary files differ
diff --git a/test/testfiles/plist_files/lapl_64be b/test/testfiles/plist_files/lapl_64be
index f93e19a..eee238e 100644
--- a/test/testfiles/plist_files/lapl_64be
+++ b/test/testfiles/plist_files/lapl_64be
Binary files differ
diff --git a/test/testfiles/plist_files/lapl_64le b/test/testfiles/plist_files/lapl_64le
index f93e19a..eee238e 100644
--- a/test/testfiles/plist_files/lapl_64le
+++ b/test/testfiles/plist_files/lapl_64le
Binary files differ