diff options
| author | Brian Sawicki <bsawicki@hdfgroup.org> | 2021-11-29 22:34:34 (GMT) |
|---|---|---|
| committer | Brian Sawicki <bsawicki@hdfgroup.org> | 2021-11-29 22:34:34 (GMT) |
| commit | d9a532137cdc65f14910f846b95b9c44ddaefb0b (patch) | |
| tree | 9b0a98504d2bad7ebf081fc85fd0752b58ad805d /test | |
| parent | d9fd012d05c46a2ec894f823d9407d8989bf131d (diff) | |
| parent | bf414540dcaa9a7feab65155d009cedacdc173ee (diff) | |
| download | hdf5-d9a532137cdc65f14910f846b95b9c44ddaefb0b.zip hdf5-d9a532137cdc65f14910f846b95b9c44ddaefb0b.tar.gz hdf5-d9a532137cdc65f14910f846b95b9c44ddaefb0b.tar.bz2 | |
fix merge conflict
Diffstat (limited to 'test')
| -rw-r--r-- | test/onion.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/test/onion.c b/test/onion.c index cbb8cec..4256184 100644 --- a/test/onion.c +++ b/test/onion.c @@ -2426,9 +2426,9 @@ test_several_revisions_with_logical_gaps(void) 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)); + 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; @@ -3120,7 +3120,7 @@ test_integration_create(void) if (H5Fclose(file) < 0) TEST_ERROR - /* + /* * Create first revision */ HDputs("."); @@ -3176,7 +3176,7 @@ test_integration_create(void) TEST_ERROR file_id = H5I_INVALID_HID; - /* + /* * Create second revision */ HDputs("."); @@ -3239,7 +3239,7 @@ test_integration_create(void) // Read back data to check for validtiy onion_info.revision_id = 2; - //onion_info.revision_id = 1; + // onion_info.revision_id = 1; fapl_id = H5Pcreate(H5P_FILE_ACCESS); if (H5I_INVALID_HID == fapl_id) TEST_ERROR; @@ -3291,7 +3291,7 @@ test_integration_create(void) for (j = 0; j < 7; j++) { // printf("i: %d, j: %d\n", i, j); int expected = i * 3 + j + 5; - //int expected = i * 6 + j + 1; + // int expected = i * 6 + j + 1; if (rdata[i][j] != expected) { printf("ERROR!!! Expected: %d, Got: %d\n", expected, rdata[i][j]); HDfflush(stdout); @@ -3344,7 +3344,7 @@ error: static int test_integration_create_simple(void) { - const char *basename = "integration.h5"; + const char * basename = "integration.h5"; hid_t fapl_id = H5I_INVALID_HID; struct onion_filepaths *paths = NULL; H5FD_onion_fapl_info_t onion_info = { @@ -3500,7 +3500,7 @@ test_integration_create_simple(void) TEST_ERROR file_id = H5I_INVALID_HID; - /* + /* * Create second revision */ HDputs("."); @@ -3557,7 +3557,7 @@ test_integration_create_simple(void) TEST_ERROR file_id = H5I_INVALID_HID; - /* + /* * Create third revision */ @@ -3623,8 +3623,8 @@ test_integration_create_simple(void) // Read back data to check for validtiy // onion_info.revision_id = 3; onion_info.revision_id = 2; - //onion_info.revision_id = 1; - //onion_info.revision_id = 0; + // onion_info.revision_id = 1; + // onion_info.revision_id = 0; fapl_id = H5Pcreate(H5P_FILE_ACCESS); if (H5I_INVALID_HID == fapl_id) TEST_ERROR; @@ -3677,10 +3677,10 @@ test_integration_create_simple(void) // for (j = 0; j < 1024; j++) { for (j = 0; j < 1024; j += 20) { // printf("i: %d, j: %d\n", i, j); - //int expected = j; - //int expected = j + 1024; + // int expected = j; + // int expected = j + 1024; int expected = j + 2048; - //int expected = j + 3072; + // int expected = j + 3072; if (rdata[i][j] != expected) { printf("ERROR!!! Expected: %d, Got: %d\n", expected, rdata[i][j]); HDfflush(stdout); @@ -3703,10 +3703,10 @@ test_integration_create_simple(void) TEST_ERROR; fapl_id = H5I_INVALID_HID; - //HDremove(paths->canon); - //HDremove(paths->onion); - //HDremove(paths->recovery); - //onion_filepaths_destroy(paths); + // HDremove(paths->canon); + // HDremove(paths->onion); + // HDremove(paths->recovery); + // onion_filepaths_destroy(paths); PASSED(); return 0; @@ -3714,10 +3714,10 @@ test_integration_create_simple(void) error: if (paths != NULL) { - //HDremove(paths->canon); - //HDremove(paths->onion); - //HDremove(paths->recovery); - //onion_filepaths_destroy(paths); + // HDremove(paths->canon); + // HDremove(paths->onion); + // HDremove(paths->recovery); + // onion_filepaths_destroy(paths); } if (dset != H5I_INVALID_HID) |