[svn-r51] ./test/tstab.c

./test/tohdr.c
./test/tmeta.c
./test/theap.c
./test/tfile.c
./test/testhdf5.h
./test/testhdf5.c
	Changed the MESSAGE macro so it doesn't have a semicolon
	inside the argument list and automatic indentation tools work
	better.

	Old call:  MESSAGE (5, printfunc("foo%s %d", s, i););
        New call:  MESSAGE (5, ("foo%s %d", s, i));

	The parentheses are required.

./test/tstab.c
	Added more tests.

1 files changed, 14 insertions, 14 deletions

diff --git a/test/tohdr.c b/test/tohdr.c
index c1ecb0e..5e192e9 100644
--- a/test/tohdr.c
+++ b/test/tohdr.c
@@ -51,7 +51,7 @@ test_ohdr (void)
    hbool_t	ent_mod;
    int		i;
    
-   MESSAGE (5, print_func("Testing Object Headers\n"););
+   MESSAGE (5, ("Testing Object Headers\n"));
 
    /* create the file */
    fid = H5Fcreate ("tohdr.h5", H5ACC_OVERWRITE, 0, 0);
@@ -60,17 +60,17 @@ test_ohdr (void)
    CHECK (f, NULL, "H5Aatom_object");
 
    /* the new object header */
-   MESSAGE (8, print_func("Creating new object header...\n"););
+   MESSAGE (8, ("Creating new object header...\n"));
    oh = H5O_new (f, 1, 64);
 
    /*
     * Test creation of a new message.
     */
-   MESSAGE (8, print_func("Creating new message...\n"););
+   MESSAGE (8, ("Creating new message...\n"));
    stab.btree = 11111111;
    stab.heap  = 22222222;
    status = H5O_modify (f, oh, NULL, NULL, H5O_STAB, H5O_NEW_MESG, &stab);
-   CHECK (status, FAIL, "H5O_modify");
+   VERIFY (status, 0, "H5O_modify");
 
    H5AC_flush (f, NULL, 0, TRUE);
    ptr = H5O_read (f, oh, NULL, H5O_STAB, 0, &ro);
@@ -82,11 +82,11 @@ test_ohdr (void)
    /*
     * Test modification of an existing message.
     */
-   MESSAGE (8, print_func("Modifying message...\n"););
+   MESSAGE (8, ("Modifying message...\n"));
    stab.btree = 33333333;
    stab.heap  = 44444444;
    status = H5O_modify (f, oh, NULL, NULL, H5O_STAB, 0, &stab);
-   CHECK (status, FAIL, "H5O_modify");
+   VERIFY (status, 0, "H5O_modify");
 
    H5AC_flush (f, NULL, 0, TRUE);
    ptr = H5O_read (f, oh, NULL, H5O_STAB, 0, &ro);
@@ -99,13 +99,13 @@ test_ohdr (void)
     * Test creation of a second message of the same type with a symbol
     * table.
     */
-   MESSAGE (8, print_func("Creating a duplicate message...\n"););
+   MESSAGE (8, ("Creating a duplicate message...\n"));
    ent.header = 0;
    ent.type = H5G_NOTHING_CACHED;
    stab.btree = 55555555;
    stab.heap  = 66666666;
    status = H5O_modify (f, oh, &ent, &ent_mod, H5O_STAB, H5O_NEW_MESG, &stab);
-   CHECK (status, FAIL, "H5O_modify");
+   VERIFY (status, 1, "H5O_modify");
    VERIFY (ent_mod, TRUE, "H5O_modify");
    VERIFY (ent.type, H5G_CACHED_STAB, "H5O_modify");
    VERIFY (ent.cache.stab.heap, stab.heap, "H5O_modify");
@@ -121,11 +121,11 @@ test_ohdr (void)
    /*
     * Test modification of the second message with a symbol table.
     */
-   MESSAGE (8, print_func("Modifying the duplicate message...\n"););
+   MESSAGE (8, ("Modifying the duplicate message...\n"));
    stab.btree = 77777777;
    stab.heap  = 88888888;
    status = H5O_modify (f, oh, &ent, &ent_mod, H5O_STAB, 1, &stab);
-   CHECK (status, FAIL, "H5O_modify");
+   VERIFY (status, 1, "H5O_modify");
    VERIFY (ent_mod, TRUE, "H5O_modify");
    VERIFY (ent.type, H5G_CACHED_STAB, "H5O_modify");
    VERIFY (ent.cache.stab.heap, stab.heap, "H5O_modify");
@@ -142,12 +142,12 @@ test_ohdr (void)
     * Test creation of a bunch of messages one after another to see
     * what happens when the object header overflows in core.
     */
-   MESSAGE (8, print_func("Overflowing header in core...\n"););
+   MESSAGE (8, ("Overflowing header in core...\n"));
    for (i=0; i<40; i++) {
       stab.btree = (i+1)*1000 + 1;
       stab.heap  = (i+1)*1000 + 2;
       status = H5O_modify (f, oh, NULL, NULL, H5O_STAB, H5O_NEW_MESG, &stab);
-      CHECK (status, FAIL, "H5O_modify");
+      VERIFY (status, 2+i, "H5O_modify");
    }
    H5AC_flush (f, NULL, 0, TRUE);
 
@@ -155,12 +155,12 @@ test_ohdr (void)
     * Test creation of a bunch of messages one after another to see
     * what happens when the object header overflows on disk.
     */
-   MESSAGE (8, print_func("Overflowing header on disk...\n"););
+   MESSAGE (8, ("Overflowing header on disk...\n"));
    for (i=0; i<10; i++) {
       stab.btree = (i+1)*1000 + 10;
       stab.heap  = (i+1)*1000 + 20;
       status = H5O_modify (f, oh, NULL, NULL, H5O_STAB, H5O_NEW_MESG, &stab);
-      CHECK (status, FAIL, "H5O_modify");
+      VERIFY (status, 42+i, "H5O_modify");
       H5AC_flush (f, NULL, 0, TRUE);
    }