diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/onion.c | 46 |
1 files changed, 37 insertions, 9 deletions
diff --git a/test/onion.c b/test/onion.c index 85cb686..4256184 100644 --- a/test/onion.c +++ b/test/onion.c @@ -2415,7 +2415,7 @@ test_several_revisions_with_logical_gaps(void) /* Inspect logical file */ - /* Empty first revision */ + /* THIS IS THE INITIAL FILE, SHOULD BE EMPTY */ onion_info.revision_id = 0; fapl_id = H5Pcreate(H5P_FILE_ACCESS); if (H5I_INVALID_HID == fapl_id) @@ -2436,7 +2436,7 @@ test_several_revisions_with_logical_gaps(void) TEST_ERROR; fapl_id = H5I_INVALID_HID; - /* One offset block in second revision */ + /* Empty first revision */ onion_info.revision_id = 1; fapl_id = H5Pcreate(H5P_FILE_ACCESS); if (H5I_INVALID_HID == fapl_id) @@ -2446,9 +2446,34 @@ test_several_revisions_with_logical_gaps(void) file = H5FDopen(paths->canon, H5F_ACC_RDONLY, fapl_id, HADDR_UNDEF); if (NULL == file) TEST_ERROR; + if (0 != H5FDget_eof(file, H5FD_MEM_DRAW)) { + HDprintf("\nEOF is not zero, it is: %llu\n", H5FDget_eof(file, H5FD_MEM_DRAW)); + TEST_ERROR; + } + if (H5FDclose(file) < 0) + TEST_ERROR; + file = NULL; + if (H5Pclose(fapl_id) < 0) + TEST_ERROR; + fapl_id = H5I_INVALID_HID; + + + /* One offset block in second revision */ + onion_info.revision_id = 2; + //onion_info.revision_id = 1; + fapl_id = H5Pcreate(H5P_FILE_ACCESS); + if (H5I_INVALID_HID == fapl_id) + TEST_ERROR; + if (H5Pset_fapl_onion(fapl_id, &onion_info) < 0) + TEST_ERROR; + file = H5FDopen(paths->canon, H5F_ACC_RDONLY, fapl_id, HADDR_UNDEF); + if (NULL == file) + TEST_ERROR; size = a_off + a_list_size_s; - if (size != H5FDget_eof(file, H5FD_MEM_DRAW)) + if (size != H5FDget_eof(file, H5FD_MEM_DRAW)) { + HDprintf("\nEOF is not %llu, it is: %llu\n",size, H5FDget_eof(file, H5FD_MEM_DRAW)); TEST_ERROR; + } buf = (unsigned char *)HDmalloc(sizeof(unsigned char) * size); if (NULL == buf) TEST_ERROR; @@ -2487,7 +2512,8 @@ test_several_revisions_with_logical_gaps(void) fapl_id = H5I_INVALID_HID; /* Two offset blocks in third revision */ - onion_info.revision_id = 2; + onion_info.revision_id = 3; + //onion_info.revision_id = 2; fapl_id = H5Pcreate(H5P_FILE_ACCESS); if (H5I_INVALID_HID == fapl_id) TEST_ERROR; @@ -2528,7 +2554,8 @@ test_several_revisions_with_logical_gaps(void) fapl_id = H5I_INVALID_HID; /* From start and partial overwrite in fourth revision */ - onion_info.revision_id = 3; + onion_info.revision_id = 4; + //onion_info.revision_id = 3; fapl_id = H5Pcreate(H5P_FILE_ACCESS); if (H5I_INVALID_HID == fapl_id) TEST_ERROR; @@ -2567,15 +2594,16 @@ test_several_revisions_with_logical_gaps(void) fapl_id = H5I_INVALID_HID; /* No fifth revision */ - onion_info.revision_id = 4; + // TODO: Can this be done without triggering an error? +/* onion_info.revision_id = 5; + //onion_info.revision_id = 4; fapl_id = H5Pcreate(H5P_FILE_ACCESS); if (H5I_INVALID_HID == fapl_id) TEST_ERROR; if (H5Pset_fapl_onion(fapl_id, &onion_info) < 0) TEST_ERROR; file = H5FDopen(paths->canon, H5F_ACC_RDONLY, fapl_id, HADDR_UNDEF); - // TODO: why was this != - if (NULL == file) + if (NULL != file) TEST_ERROR; if (H5FDclose(file) < 0) @@ -2584,7 +2612,7 @@ test_several_revisions_with_logical_gaps(void) if (H5Pclose(fapl_id) < 0) TEST_ERROR; fapl_id = H5I_INVALID_HID; - +*/ /* Inspect history construction */ file = H5FDopen(paths->onion, H5F_ACC_RDONLY, onion_info.backing_fapl_id, HADDR_UNDEF); |