From 87411d7b2d845d52bdbde7fcc473220c22936a47 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Mon, 30 Oct 2006 10:57:57 -0500 Subject: [svn-r12827] Description: Correct typo that was causing tests to fail. Tested on: Linux/32 2.6 (chicago) Linux/64 2.6 (chicago2) --- src/H5Gobj.c | 2 +- test/links.c | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/H5Gobj.c b/src/H5Gobj.c index fd8a31e..0762b87 100644 --- a/src/H5Gobj.c +++ b/src/H5Gobj.c @@ -256,7 +256,7 @@ H5G_obj_create(H5F_t *f, hid_t dxpl_id, const H5O_ginfo_t *ginfo, size_t link_size; /* Size of a link message */ /* Calculate message size infomation, for creating group's object header */ - linfo_size = H5O_mesg_size(H5O_LINFO_ID, f, &linfo, (size_t)0); + linfo_size = H5O_mesg_size(H5O_LINFO_ID, f, linfo, (size_t)0); HDassert(linfo_size); ginfo_size = H5O_mesg_size(H5O_GINFO_ID, f, ginfo, (size_t)0); diff --git a/test/links.c b/test/links.c index 28c7fab..e33057e 100644 --- a/test/links.c +++ b/test/links.c @@ -75,7 +75,7 @@ const char *FILENAME[] = { /* Creation order macros */ #define CORDER_GROUP_NAME "corder_group" -#ifdef QAK +#ifndef QAK /*------------------------------------------------------------------------- * Function: mklinks @@ -5435,9 +5435,7 @@ corder_create_dense(hid_t fapl) if(H5Pset_creation_order_tracking(gcpl_id, TRUE) < 0) TEST_ERROR /* Create group with creation order indexing & tracking on */ -HDfprintf(stderr, "Before creating group with creation order tracking & index\n"); if((group_id = H5Gcreate_expand(file_id, gcpl_id, H5P_DEFAULT)) < 0) TEST_ERROR -HDfprintf(stderr, "After creating group with creation order tracking & index\n"); if(H5Llink(file_id, CORDER_GROUP_NAME, group_id, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR /* Check on group's initial status */ @@ -5561,7 +5559,7 @@ main(void) /* Set the "use the latest version of the format" flag for creating objects in the file */ if(H5Pset_latest_format(fapl2, TRUE) < 0) TEST_ERROR -#ifdef QAK +#ifndef QAK /* Loop over using new group format */ for(new_format = FALSE; new_format <= TRUE; new_format++) { /* General tests... (on both old & new format groups */ @@ -5619,6 +5617,13 @@ main(void) /* Creation order tests */ if(new_format == TRUE) { + nerrors += corder_create_empty(fapl2) < 0 ? 1 : 0; +/* XXX: when creation order indexing is fully working, go back and add checks + * to these tests to make certain that the creation order values are + * correct. + */ + nerrors += corder_create_compact(fapl2) < 0 ? 1 : 0; + nerrors += corder_create_dense(fapl2) < 0 ? 1 : 0; } /* end if */ } /* end for */ #else /* QAK */ -- cgit v0.12