From 629c693d822ff7ab140bd18fe5ef256bffb60322 Mon Sep 17 00:00:00 2001 From: Fang Guo Date: Wed, 7 Sep 2005 16:44:16 -0500 Subject: [svn-r11365] Purpose: Add more assertion error check Description: Solution: Platforms tested: heping Misc. update: --- test/ttsafe_acreate.c | 12 ++++++++---- test/ttsafe_cancel.c | 4 ++-- test/ttsafe_dcreate.c | 6 ++++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/test/ttsafe_acreate.c b/test/ttsafe_acreate.c index 1ab54a8..987c145 100644 --- a/test/ttsafe_acreate.c +++ b/test/ttsafe_acreate.c @@ -144,10 +144,14 @@ void tts_acreate(void) } /* close remaining resources */ - H5Sclose(dataspace); - H5Tclose(datatype); - H5Dclose(dataset); - H5Fclose(file); + ret=H5Sclose(dataspace); + assert(ret>=0); + ret=H5Tclose(datatype); + assert(ret>=0); + ret=H5Dclose(dataset); + assert(ret>=0); + ret=H5Fclose(file); + assert(ret>=0); } void *tts_acreate_thread(void *client_data) diff --git a/test/ttsafe_cancel.c b/test/ttsafe_cancel.c index b707240..e2f7cce 100644 --- a/test/ttsafe_cancel.c +++ b/test/ttsafe_cancel.c @@ -140,7 +140,7 @@ void *tts_cancel_thread(void UNUSED *arg) /* create a new dataset within the file */ dataset = H5Dcreate(cancel_file, DATASETNAME, datatype, dataspace, H5P_DEFAULT); - assert(dataset>=0); + assert(dataset>=0); /* If thread is cancelled, make cleanup call */ cleanup_structure = (cancel_cleanup_t*)malloc(sizeof(cancel_cleanup_t)); @@ -152,7 +152,7 @@ void *tts_cancel_thread(void UNUSED *arg) datavalue = 1; ret=H5Dwrite(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, &datavalue); - assert(ret>=0); + assert(ret>=0); buffer = malloc(sizeof(int)); ret=H5Dread(dataset, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buffer); diff --git a/test/ttsafe_dcreate.c b/test/ttsafe_dcreate.c index a3bc763..79ac55f 100644 --- a/test/ttsafe_dcreate.c +++ b/test/ttsafe_dcreate.c @@ -139,8 +139,10 @@ void tts_dcreate(void) if (datavalue != i) { TestErrPrintf("Wrong value read %d for dataset name %s - test failed\n", datavalue, dsetname[i]); - H5Dclose(dataset); - H5Fclose(file); + ret=H5Dclose(dataset); + assert(ret>=0); + ret=H5Fclose(file); + assert(ret>=0); return; } -- cgit v0.12