diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2016-04-03 08:48:50 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2016-04-03 08:48:50 (GMT) |
| commit | 3cd705e56e6ef13c3423df68bb12704d483409ae (patch) | |
| tree | f5010140d9de52c26e5d312532cfc64500988f24 /test | |
| parent | 9d2178ab886ae957cfe11b6fe09f9e7f0e9ce369 (diff) | |
| download | hdf5-3cd705e56e6ef13c3423df68bb12704d483409ae.zip hdf5-3cd705e56e6ef13c3423df68bb12704d483409ae.tar.gz hdf5-3cd705e56e6ef13c3423df68bb12704d483409ae.tar.bz2 | |
[svn-r29612] Description:
Bring updated layout and EFL property comparisons and new "latest format"
flags from revise_chunks branch.
Tested on:
MacOSX/64 10.11.4 (amazon) w/serial, parallel & production
(h5committest forthcoming)
Diffstat (limited to 'test')
| -rw-r--r-- | test/objcopy.c | 39 |
1 files changed, 1 insertions, 38 deletions
diff --git a/test/objcopy.c b/test/objcopy.c index a9791d5..e435dd1 100644 --- a/test/objcopy.c +++ b/test/objcopy.c @@ -1219,47 +1219,10 @@ compare_datasets(hid_t did, hid_t did2, hid_t pid, const void *wbuf) /* Open the dataset creation property list for the destination dataset */ if((dcpl2 = H5Dget_create_plist(did2)) < 0) TEST_ERROR - /* If external file storage is being used, the value stored in the - * dcpl will be a heap ID, which is not guaranteed to be the same in - * source and destination files. - * Instead, compare the actual external file values and then - * delete this property from the dcpls before comparing them. - */ - if((ext_count = H5Pget_external_count(dcpl)) < 0) TEST_ERROR - - if(ext_count > 0) - { - unsigned x; /* Counter varaible */ - char name1[NAME_BUF_SIZE]; - char name2[NAME_BUF_SIZE]; - off_t offset1=0; - off_t offset2=0; - hsize_t size1=0; - hsize_t size2=0; - - if(H5Pget_external_count(dcpl2) != ext_count) TEST_ERROR - - /* Ensure that all external file information is the same */ - for(x=0; x < (unsigned) ext_count; ++x) - { - if(H5Pget_external(dcpl, x, (size_t)NAME_BUF_SIZE, name1, &offset1, &size1) < 0) TEST_ERROR - if(H5Pget_external(dcpl2, x, (size_t)NAME_BUF_SIZE, name2, &offset2, &size2) < 0) TEST_ERROR - - if(offset1 != offset2) TEST_ERROR - if(size1 != size2) TEST_ERROR - if(HDstrcmp(name1, name2) != 0) TEST_ERROR - } - - /* Reset external file information from the dcpls */ - /* (Directly removing default property causes memory leak) */ - if (H5P_reset_external_file_test(dcpl) < 0) TEST_ERROR - if (H5P_reset_external_file_test(dcpl2) < 0) TEST_ERROR - } - /* Compare the rest of the dataset creation property lists */ if(H5Pequal(dcpl, dcpl2) != TRUE) TEST_ERROR - /* Get the number of filters on dataset */ + /* Get the number of filters on dataset (for later) */ if((nfilters = H5Pget_nfilters(dcpl)) < 0) TEST_ERROR /* close the source dataset creation property list */ |