diff options
Diffstat (limited to 'hl/test')
-rw-r--r-- | hl/test/gen_test_ds.c | 10 | ||||
-rw-r--r-- | hl/test/test_ds.c | 50 | ||||
-rw-r--r-- | hl/test/test_dset_append.c | 16 | ||||
-rw-r--r-- | hl/test/test_file_image.c | 10 | ||||
-rw-r--r-- | hl/test/test_h5do_compat.c | 4 | ||||
-rw-r--r-- | hl/test/test_image.c | 6 | ||||
-rw-r--r-- | hl/test/test_ld.c | 20 | ||||
-rw-r--r-- | hl/test/test_table.c | 2 |
8 files changed, 59 insertions, 59 deletions
diff --git a/hl/test/gen_test_ds.c b/hl/test/gen_test_ds.c index e0a3499..7b45694 100644 --- a/hl/test/gen_test_ds.c +++ b/hl/test/gen_test_ds.c @@ -336,7 +336,7 @@ out: H5Dclose(did); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); @@ -400,7 +400,7 @@ out: H5Dclose(did); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); @@ -480,7 +480,7 @@ out: H5Dclose(did); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); @@ -561,7 +561,7 @@ out: H5Dclose(did); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); @@ -609,7 +609,7 @@ out: H5Dclose(did); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); diff --git a/hl/test/test_ds.c b/hl/test/test_ds.c index 70af31a..9792441 100644 --- a/hl/test/test_ds.c +++ b/hl/test/test_ds.c @@ -1331,7 +1331,7 @@ out: H5Dclose(dsid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); @@ -1387,7 +1387,7 @@ out: H5Dclose(did); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); @@ -1467,7 +1467,7 @@ out: H5Dclose(did); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); @@ -1531,7 +1531,7 @@ out: H5Dclose(did); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); @@ -1591,7 +1591,7 @@ out: H5Dclose(did); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); @@ -1651,7 +1651,7 @@ out: H5Dclose(did); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); @@ -1715,7 +1715,7 @@ out: H5Dclose(did); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); @@ -1798,7 +1798,7 @@ out: H5Dclose(did); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); @@ -1862,7 +1862,7 @@ out: H5Dclose(did); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); @@ -1974,7 +1974,7 @@ out: H5Dclose(did); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); @@ -2054,7 +2054,7 @@ out: H5Dclose(did); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); @@ -2126,7 +2126,7 @@ out: H5Dclose(did); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); @@ -2198,7 +2198,7 @@ out: H5Dclose(did); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); @@ -2278,7 +2278,7 @@ out: H5Dclose(did); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); @@ -2327,7 +2327,7 @@ out: H5Dclose(did); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); @@ -3530,7 +3530,7 @@ out: H5Sclose(sid); H5Gclose(gid); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); return FAIL; } @@ -3664,7 +3664,7 @@ out: HDfree(buf); } } - H5E_END_TRY; + H5E_END_TRY return FAIL; } @@ -3749,7 +3749,7 @@ out: { H5Sclose(sid); } - H5E_END_TRY; + H5E_END_TRY return FAIL; } @@ -4189,7 +4189,7 @@ out: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); return FAIL; } @@ -4374,7 +4374,7 @@ out: H5Dclose(did); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); return FAIL; } @@ -4583,7 +4583,7 @@ out: H5Sclose(sid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); return FAIL; } @@ -4762,7 +4762,7 @@ out: H5Dclose(dsid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); return FAIL; } @@ -4920,7 +4920,7 @@ out: H5Dclose(dsid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); if (latbuf) @@ -5187,7 +5187,7 @@ out: H5Dclose(dsid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); return FAIL; } @@ -5428,7 +5428,7 @@ out: H5Gclose(gid); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); return FAIL; } diff --git a/hl/test/test_dset_append.c b/hl/test/test_dset_append.c index c4afe89..b287d25 100644 --- a/hl/test/test_dset_append.c +++ b/hl/test/test_dset_append.c @@ -122,7 +122,7 @@ error: H5Dclose(did); H5Pclose(ffapl); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_dataset_append_notset() */ @@ -296,7 +296,7 @@ error: H5Dclose(did); H5Pclose(ffapl); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_dataset_append_rows_columns() */ @@ -432,7 +432,7 @@ error: H5Dclose(did); H5Pclose(ffapl); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_dataset_append_rows() */ @@ -569,7 +569,7 @@ error: H5Dclose(did); H5Pclose(ffapl); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_dataset_append_columns() */ @@ -732,7 +732,7 @@ error: H5Dclose(did); H5Pclose(ffapl); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_dataset_append_BUG1() */ @@ -895,7 +895,7 @@ error: H5Dclose(did); H5Pclose(ffapl); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_dataset_append_BUG2() */ @@ -1054,7 +1054,7 @@ error: H5Dclose(did); H5Pclose(ffapl); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_dataset_append_less() */ @@ -1211,7 +1211,7 @@ error: H5Dclose(did); H5Pclose(ffapl); } - H5E_END_TRY; + H5E_END_TRY return 1; } /* test_dataset_append_vary() */ diff --git a/hl/test/test_file_image.c b/hl/test/test_file_image.c index defaab2..0a10e36 100644 --- a/hl/test/test_file_image.c +++ b/hl/test/test_file_image.c @@ -335,7 +335,7 @@ test_file_image(size_t open_images, size_t nflags, const unsigned *flags) { status1 = H5Dwrite(dset_id[i], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data1); } - H5E_END_TRY; + H5E_END_TRY VERIFY(status1 < 0, "H5Dwrite() should have failed"); @@ -344,7 +344,7 @@ test_file_image(size_t open_images, size_t nflags, const unsigned *flags) { status1 = H5Dset_extent(dset_id[i], dims4); } - H5E_END_TRY; + H5E_END_TRY VERIFY(status1 < 0, "H5Dset_extent() should have failed"); @@ -353,7 +353,7 @@ test_file_image(size_t open_images, size_t nflags, const unsigned *flags) { status1 = H5Dwrite(dset_id[i], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data4); } - H5E_END_TRY; + H5E_END_TRY VERIFY(status1 < 0, "H5Dwrite() should have failed"); @@ -408,13 +408,13 @@ test_file_image(size_t open_images, size_t nflags, const unsigned *flags) status2 = H5Fflush(file_id[i], H5F_SCOPE_GLOBAL); VERIFY(status1 < 0 || status2 < 0, "writing and flushing attr should have failed"); - } H5E_END_TRY; + } H5E_END_TRY /* close attr and attr_space -- expect errors on close */ H5E_BEGIN_TRY { H5Sclose(attr_space_id); H5Aclose(attr_id); - } H5E_END_TRY; + } H5E_END_TRY #endif if (H5Dclose(dset_id[i]) < 0) FAIL_PUTS_ERROR("H5Dclose() failed"); diff --git a/hl/test/test_h5do_compat.c b/hl/test/test_h5do_compat.c index 4a3c607..2610c33 100644 --- a/hl/test/test_h5do_compat.c +++ b/hl/test/test_h5do_compat.c @@ -84,7 +84,7 @@ error: H5Sclose(sid); H5Pclose(dcpl_id); } - H5E_END_TRY; + H5E_END_TRY return H5I_INVALID_HID; @@ -223,7 +223,7 @@ error: H5Sclose(mem_sid); H5Sclose(file_sid); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); return 1; diff --git a/hl/test/test_image.c b/hl/test/test_image.c index 462a3ce..8a67883 100644 --- a/hl/test/test_image.c +++ b/hl/test/test_image.c @@ -304,7 +304,7 @@ out: { H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); return FAIL; } @@ -494,7 +494,7 @@ out: { H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY H5_FAILED(); return FAIL; @@ -730,7 +730,7 @@ out: { H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY if (f) HDfclose(f); H5_FAILED(); diff --git a/hl/test/test_ld.c b/hl/test/test_ld.c index 11ea0e6..b056225 100644 --- a/hl/test/test_ld.c +++ b/hl/test/test_ld.c @@ -255,7 +255,7 @@ test_LD_dims_params(const char *file) { ret = H5LDget_dset_dims(invalid_id, one_cur_dims); } - H5E_END_TRY; + H5E_END_TRY VERIFY_EQUAL(ret, FAIL) /* @@ -267,7 +267,7 @@ test_LD_dims_params(const char *file) { ret = H5LDget_dset_dims(did, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY_EQUAL(ret, FAIL) if (H5Dclose(did) < 0) FAIL_STACK_ERROR; @@ -336,7 +336,7 @@ error: H5Dclose(did); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return (-1); } /* test_LD_dims_params() */ @@ -481,7 +481,7 @@ error: H5Dclose(did); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return (-1); } /* test_LD_dims() */ @@ -545,7 +545,7 @@ test_LD_size(const char *file) { dsize = H5LDget_dset_type_size(invalid_id, NULL); } - H5E_END_TRY; + H5E_END_TRY VERIFY_EQUAL(dsize, 0) /* @@ -822,7 +822,7 @@ error: H5Dclose(did); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return (-1); } /* test_LD_size() */ @@ -928,7 +928,7 @@ test_LD_elmts_invalid(const char *file) { ret = H5LDget_dset_elmts(invalid_id, prev_dims, cur_dims, NULL, tbuf); } - H5E_END_TRY; + H5E_END_TRY VERIFY_EQUAL(ret, FAIL) /* Open dataset: DSET_CMPD */ @@ -964,7 +964,7 @@ error: H5Dclose(did); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return (-1); } /* test_LD_elmts_invalid() */ @@ -1122,7 +1122,7 @@ error: H5Dclose(did); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return (-1); } /* test_LD_elmts_one() */ @@ -1336,7 +1336,7 @@ error: H5Dclose(did); H5Fclose(fid); } - H5E_END_TRY; + H5E_END_TRY return (-1); } /* test_LD_elmts_two() */ diff --git a/hl/test/test_table.c b/hl/test/test_table.c index 3c8246a..7bef41d 100644 --- a/hl/test/test_table.c +++ b/hl/test/test_table.c @@ -823,7 +823,7 @@ test_table(hid_t fid, int do_write) nrecords = 3; if (H5TBdelete_record(fid, "table", start, nrecords) < 0) goto out; - ; + /* Get table info */ if (H5TBget_table_info(fid, "table", &nfields_out, &nrecords_out) < 0) goto out; |