summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--test/dsets.c41
1 files changed, 17 insertions, 24 deletions
diff --git a/test/dsets.c b/test/dsets.c
index 544d0e2..5de9cfa 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -13072,15 +13072,13 @@ test_object_header_minimization_dcpl(void)
/*********/
if(NULL == h5_fixname(OHMIN_FILENAME_A, H5P_DEFAULT, filename, sizeof(filename)))
- TEST_ERROR("unable to prepare filename");
+ TEST_ERROR
file_id = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
- if (0 > file_id)
- TEST_ERROR("unable to create test file\n");
+ if (0 > file_id) TEST_ERROR
dcpl_id = H5Pcreate(H5P_DATASET_CREATE);
- if (0 > dcpl_id)
- TEST_ERROR("unable to create DCPL\n");
+ if (0 > dcpl_id) TEST_ERROR
/*********/
/* TESTS */
@@ -13088,28 +13086,23 @@ test_object_header_minimization_dcpl(void)
/* default value (not set explicitly)
*/
- if (H5Pget_dset_no_attrs_hint(dcpl_id, &minimize) == FAIL)
- TEST_ERROR("unable to get minimize value\n");
+ if (H5Pget_dset_no_attrs_hint(dcpl_id, &minimize) == FAIL) TEST_ERROR
if (FALSE != minimize)
- TEST_ERROR("Expected FALSE default but was not!\n");
+ TEST_ERROR
/* FALSE-set value
*/
- if (H5Pset_dset_no_attrs_hint(dcpl_id, FALSE) == FAIL)
- TEST_ERROR("unable to set minimize value to FALSE\n");
- if (H5Pget_dset_no_attrs_hint(dcpl_id, &minimize) == FAIL)
- TEST_ERROR("unable to get minimize value\n");
+ if (H5Pset_dset_no_attrs_hint(dcpl_id, FALSE) == FAIL) TEST_ERROR
+ if (H5Pget_dset_no_attrs_hint(dcpl_id, &minimize) == FAIL) TEST_ERROR
if (FALSE != minimize)
- TEST_ERROR("Expected FALSE default but was not!\n");
+ TEST_ERROR
/* TRUE-set value
*/
- if (H5Pset_dset_no_attrs_hint(dcpl_id, TRUE) == FAIL)
- TEST_ERROR("unable to set minimize value to TRUE\n");
- if (H5Pget_dset_no_attrs_hint(dcpl_id, &minimize) == FAIL)
- TEST_ERROR("unable to get minimize value\n");
+ if (H5Pset_dset_no_attrs_hint(dcpl_id, TRUE) == FAIL) TEST_ERROR
+ if (H5Pget_dset_no_attrs_hint(dcpl_id, &minimize) == FAIL) TEST_ERROR
if (TRUE != minimize)
- TEST_ERROR("Expected TRUE default but was not!\n");
+ TEST_ERROR
/* error cases
*/
@@ -13117,35 +13110,35 @@ test_object_header_minimization_dcpl(void)
ret = H5Pget_dset_no_attrs_hint(-1, &minimize);
} H5E_END_TRY;
if (ret == SUCCEED)
- TEST_ERROR("Invalid DCPL ID should fail\n");
+ TEST_ERROR /* Invalid DCPL ID should fail */
H5E_BEGIN_TRY {
ret = H5Pset_dset_no_attrs_hint(-1, FALSE);
} H5E_END_TRY;
if (ret == SUCCEED)
- TEST_ERROR("Invalid DCPL ID should fail\n");
+ TEST_ERROR /* Invalid DCPL ID should fail */
H5E_BEGIN_TRY {
ret = H5Pset_dset_no_attrs_hint(-1, TRUE);
} H5E_END_TRY;
if (ret == SUCCEED)
- TEST_ERROR("Invalid DCPL ID should fail\n");
+ TEST_ERROR /* Invalid DCPL ID should fail */
H5E_BEGIN_TRY {
ret = H5Pget_dset_no_attrs_hint(dcpl_id, NULL);
} H5E_END_TRY;
if (ret == SUCCEED)
- TEST_ERROR("NULL out pointer should fail\n");
+ TEST_ERROR /* NULL out pointer should fail */
/************/
/* TEARDOWN */
/************/
if (H5Fclose(file_id) == FAIL)
- TEST_ERROR("can't close FILE");
+ TEST_ERROR
if (H5Pclose(dcpl_id) == FAIL)
- TEST_ERROR("unable to close DCPL\n");
+ TEST_ERROR
PASSED();
return SUCCEED;