diff options
Diffstat (limited to 'test/titerate.c')
| -rw-r--r-- | test/titerate.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/test/titerate.c b/test/titerate.c index ecd566b..539a9fa 100644 --- a/test/titerate.c +++ b/test/titerate.c @@ -466,19 +466,24 @@ static void test_iter_attr(hid_t fapl, hbool_t new_format) /* Verify return value from iterator gets propagated correctly */ VERIFY(ret,2,"H5Aiterate"); - /* Increment the number of times "1" is returned */ + /* Increment the number of times "2" is returned */ i++; /* Verify that the index is the correct value */ VERIFY(idx,(unsigned)i,"H5Aiterate"); /* Verify that the correct name is retrieved */ +#ifdef LATER if(HDstrcmp(info.name,anames[idx-1])!=0) - TestErrPrintf("Attribute iteration function didn't return one correctly!\n"); + TestErrPrintf("Attribute iteration function didn't return two correctly!\n"); +#endif /* LATER */ } +#ifndef LATER +HDfprintf(stderr, "Check skipped - fix after creation order for attributes implemented\n"); +#endif /* LATER */ VERIFY(ret,-1,"H5Aiterate"); if(i!=50 || idx!=50) - TestErrPrintf("Group iteration function didn't perform multiple iterations correctly!\n"); + TestErrPrintf("Attribute iteration function didn't perform multiple iterations correctly!\n"); /* Test all attributes on dataset, when callback changes return value */ @@ -496,12 +501,17 @@ static void test_iter_attr(hid_t fapl, hbool_t new_format) VERIFY(idx,(unsigned)i+10,"H5Aiterate"); /* Verify that the correct name is retrieved */ +#ifdef LATER if(HDstrcmp(info.name,anames[idx-1])!=0) TestErrPrintf("Attribute iteration function didn't return changing correctly!\n"); +#endif /* LATER */ } +#ifndef LATER +HDfprintf(stderr, "Check skipped - fix after creation order for attributes implemented\n"); +#endif /* LATER */ VERIFY(ret,-1,"H5Aiterate"); if(i!=40 || idx!=50) - TestErrPrintf("Group iteration function didn't perform multiple iterations correctly!\n"); + TestErrPrintf("Attribute iteration function didn't perform multiple iterations correctly!\n"); ret=H5Fclose(file); CHECK(ret, FAIL, "H5Fclose"); @@ -522,7 +532,7 @@ static void test_iter_attr(hid_t fapl, hbool_t new_format) ****************************************************************/ int iter_strcmp2(const void *s1, const void *s2) { - return(HDstrcmp((const char *)s1,(const char *)s2)); + return(HDstrcmp((const char *)s1, (const char *)s2)); } /* end iter_strcmp2() */ /**************************************************************** |