diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-10-09 12:31:06 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-10-09 12:31:06 (GMT) |
| commit | 070a4899bf9ae9acafefc68183991ef9978d5a3d (patch) | |
| tree | 3f03f080c512d2bae27879502fe6f0b9773f8437 /test/fheap.c | |
| parent | 261bbe39aac2cf13e2cd539520c3329e1df6d452 (diff) | |
| download | hdf5-070a4899bf9ae9acafefc68183991ef9978d5a3d.zip hdf5-070a4899bf9ae9acafefc68183991ef9978d5a3d.tar.gz hdf5-070a4899bf9ae9acafefc68183991ef9978d5a3d.tar.bz2 | |
[svn-r15827] Description:
Correct mis-merge in last set of changes from the trunk.
Tested on:
FreeBSD/32 6.3 (duty)
Diffstat (limited to 'test/fheap.c')
| -rw-r--r-- | test/fheap.c | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/test/fheap.c b/test/fheap.c index b71f93c..dcfd09d 100644 --- a/test/fheap.c +++ b/test/fheap.c @@ -1927,8 +1927,6 @@ test_reopen(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t UNUSED *tparam H5HF_create_t test_cparam; /* Creation parameters for heap */ H5HF_t *fh = NULL; /* Fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ - h5_stat_size_t empty_size; /* File size, w/o heap */ - h5_stat_size_t file_size; /* File size, after deleting heap */ size_t id_len; /* Size of fractal heap IDs */ fheap_heap_state_t state; /* State of fractal heap */ @@ -1939,18 +1937,6 @@ test_reopen(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t UNUSED *tparam if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) TEST_ERROR - /* Close file */ - if(H5Fclose(file) < 0) - FAIL_STACK_ERROR - - /* Get the size of a file w/empty heap*/ - if((empty_size = h5_get_file_size(filename, fapl)) < 0) - TEST_ERROR - - /* Re-open the file */ - if((file = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) - FAIL_STACK_ERROR - /* Get a pointer to the internal file object */ if(NULL == (f = H5I_object(file))) STACK_ERROR @@ -2000,14 +1986,6 @@ test_reopen(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t UNUSED *tparam if(H5Fclose(file) < 0) FAIL_STACK_ERROR - /* Get the size of the file */ - if((file_size = h5_get_file_size(filename, fapl)) < 0) - TEST_ERROR - - /* Verify the file is correct size */ - if(file_size != empty_size) - TEST_ERROR - /* All tests passed */ PASSED() @@ -2048,8 +2026,6 @@ test_open_twice(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t UNUSED *tp H5HF_t *fh = NULL; /* Fractal heap wrapper */ H5HF_t *fh2 = NULL; /* 2nd fractal heap wrapper */ haddr_t fh_addr; /* Address of fractal heap */ - h5_stat_size_t empty_size; /* File size, w/o heap */ - h5_stat_size_t file_size; /* File size, after deleting heap */ size_t id_len; /* Size of fractal heap IDs */ fheap_heap_state_t state; /* State of fractal heap */ @@ -2064,10 +2040,6 @@ test_open_twice(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t UNUSED *tp if(NULL == (f = H5I_object(file))) STACK_ERROR - /* Get the size of a file w/empty heap*/ - if((empty_size = h5_get_file_size(filename, fapl)) < 0) - TEST_ERROR - /* Re-open the file */ if((file2 = H5Freopen(file)) < 0) FAIL_STACK_ERROR @@ -2145,14 +2117,6 @@ test_open_twice(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t UNUSED *tp if(H5Fclose(file2) < 0) FAIL_STACK_ERROR - /* Get the size of the file */ - if((file_size = h5_get_file_size(filename, fapl)) < 0) - TEST_ERROR - - /* Verify the file is correct size */ - if(file_size != empty_size) - TEST_ERROR - /* All tests passed */ PASSED() |