summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/dtypes.c14
-rw-r--r--test/getname.c2
-rw-r--r--test/tattr.c32
3 files changed, 21 insertions, 27 deletions
diff --git a/test/dtypes.c b/test/dtypes.c
index a7be6e6..d44dfb0 100644
--- a/test/dtypes.c
+++ b/test/dtypes.c
@@ -4079,11 +4079,8 @@ test_encode(void)
} /* end if */
/* Decode from the compound buffer and return an object handle */
- if((decoded_tid1=H5Tdecode(cmpd_buf))<0) {
- H5_FAILED();
- printf("Can't decode compound type\n");
- goto error;
- } /* end if */
+ if((decoded_tid1 = H5Tdecode(cmpd_buf)) < 0)
+ FAIL_PUTS_ERROR("Can't decode compound type\n")
/* Verify that the datatype was copied exactly */
if(H5Tequal(decoded_tid1, tid1)<=0) {
@@ -4219,11 +4216,8 @@ test_encode(void)
} /* end if */
/* Decode from the compound buffer and return an object handle */
- if((decoded_tid1=H5Tdecode(cmpd_buf))<0) {
- H5_FAILED();
- printf("Can't decode compound type\n");
- goto error;
- } /* end if */
+ if((decoded_tid1 = H5Tdecode(cmpd_buf)) < 0)
+ FAIL_PUTS_ERROR("Can't decode compound type\n")
/* Verify that the datatype was copied exactly */
if(H5Tequal(decoded_tid1, tid1)<=0) {
diff --git a/test/getname.c b/test/getname.c
index f367242..9cda380 100644
--- a/test/getname.c
+++ b/test/getname.c
@@ -1015,7 +1015,7 @@ test_main(hid_t file_id, hid_t fapl)
if((type_id=H5Dget_type(dataset_id))<0) TEST_ERROR;
/* Verify */
- if(check_name(type_id, "/g17/t", "") < 0) TEST_ERROR;
+ if(check_name(type_id, "/g17/t", "/g17/t") < 0) TEST_ERROR;
/* Close */
H5Dclose( dataset_id );
diff --git a/test/tattr.c b/test/tattr.c
index 31ffe2c..e4403c8 100644
--- a/test/tattr.c
+++ b/test/tattr.c
@@ -2918,11 +2918,11 @@ test_attr_shared_write(hid_t fcpl, hid_t fapl)
/* Close file */
ret = H5Fclose(fid);
CHECK(ret, FAIL, "H5Fclose");
- } /* end for */
- /* Check size of file */
- filesize = h5_get_file_size(FILENAME);
- VERIFY(filesize, empty_filesize, "h5_get_file_size");
+ /* Check size of file */
+ filesize = h5_get_file_size(FILENAME);
+ VERIFY(filesize, empty_filesize, "h5_get_file_size");
+ } /* end for */
/* Close dataspaces */
ret = H5Sclose(sid);
@@ -3359,11 +3359,11 @@ test_attr_shared_rename(hid_t fcpl, hid_t fapl)
/* Close file */
ret = H5Fclose(fid);
CHECK(ret, FAIL, "H5Fclose");
- } /* end for */
- /* Check size of file */
- filesize = h5_get_file_size(FILENAME);
- VERIFY(filesize, empty_filesize, "h5_get_file_size");
+ /* Check size of file */
+ filesize = h5_get_file_size(FILENAME);
+ VERIFY(filesize, empty_filesize, "h5_get_file_size");
+ } /* end for */
/* Close dataspaces */
ret = H5Sclose(sid);
@@ -3722,11 +3722,11 @@ test_attr_shared_delete(hid_t fcpl, hid_t fapl)
/* Close file */
ret = H5Fclose(fid);
CHECK(ret, FAIL, "H5Fclose");
- } /* end for */
- /* Check size of file */
- filesize = h5_get_file_size(FILENAME);
- VERIFY(filesize, empty_filesize, "h5_get_file_size");
+ /* Check size of file */
+ filesize = h5_get_file_size(FILENAME);
+ VERIFY(filesize, empty_filesize, "h5_get_file_size");
+ } /* end for */
/* Close dataspaces */
ret = H5Sclose(sid);
@@ -4071,11 +4071,11 @@ test_attr_shared_unlink(hid_t fcpl, hid_t fapl)
/* Close file */
ret = H5Fclose(fid);
CHECK(ret, FAIL, "H5Fclose");
- } /* end for */
- /* Check size of file */
- filesize = h5_get_file_size(FILENAME);
- VERIFY(filesize, empty_filesize, "h5_get_file_size");
+ /* Check size of file */
+ filesize = h5_get_file_size(FILENAME);
+ VERIFY(filesize, empty_filesize, "h5_get_file_size");
+ } /* end for */
/* Close dataspaces */
ret = H5Sclose(sid);