From d77d4b17425e00f99f3cc1512e94dedf05f27aa5 Mon Sep 17 00:00:00 2001 From: Pedro Vicente Nunes Date: Mon, 23 Feb 2009 14:56:24 -0500 Subject: [svn-r16511] bug fix: TESTING2 macro introduced recently for the test suite (it adds an extra space at the beginning of output, for indentation) was already available for HL and caused compilation problems on AIX. Replaced the name with TESTING_2 tested: h5committest --- test/h5test.h | 2 +- test/set_extent.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/h5test.h b/test/h5test.h index 64d43cc..e3b3596 100644 --- a/test/h5test.h +++ b/test/h5test.h @@ -99,7 +99,7 @@ extern MPI_Info h5_io_info_g; /* MPI INFO object for IO */ * the H5_FAILED() macro is invoked automatically when an API function fails. */ #define TESTING(WHAT) {printf("Testing %-62s",WHAT); fflush(stdout);} -#define TESTING2(WHAT) {printf(" Testing %-62s",WHAT); fflush(stdout);} +#define TESTING_2(WHAT) {printf(" Testing %-62s",WHAT); fflush(stdout);} #define PASSED() {puts(" PASSED");fflush(stdout);} #define H5_FAILED() {puts("*FAILED*");fflush(stdout);} #define H5_WARNING() {puts("*WARNING*");fflush(stdout);} diff --git a/test/set_extent.c b/test/set_extent.c index 87ff91c..1b6918a 100644 --- a/test/set_extent.c +++ b/test/set_extent.c @@ -153,7 +153,7 @@ static int do_ranks( hid_t fapl ) hbool_t set_istore_k = 0; - TESTING2("with fill value, no compression"); + TESTING_2("with fill value, no compression"); do_fillvalue = 1; @@ -187,7 +187,7 @@ static int do_ranks( hid_t fapl ) PASSED(); - TESTING2("no fill value, no compression"); + TESTING_2("no fill value, no compression"); do_fillvalue = 0; @@ -208,7 +208,7 @@ static int do_ranks( hid_t fapl ) PASSED(); - TESTING2("with fill value, with compression"); + TESTING_2("with fill value, with compression"); #ifdef H5_HAVE_FILTER_DEFLATE @@ -246,7 +246,7 @@ static int do_ranks( hid_t fapl ) SKIPPED(); #endif - TESTING2("no fill value, with compression"); + TESTING_2("no fill value, with compression"); #ifdef H5_HAVE_FILTER_DEFLATE @@ -270,7 +270,7 @@ static int do_ranks( hid_t fapl ) SKIPPED(); #endif - TESTING2("with non-default indexed storage B-tree"); + TESTING_2("with non-default indexed storage B-tree"); do_fillvalue = 1; set_istore_k = 1; @@ -299,7 +299,7 @@ error: static int do_layouts( hid_t fapl ) { - TESTING2("storage layout use"); + TESTING_2("storage layout use"); if (test_layouts( H5D_COMPACT, fapl ) < 0) { @@ -2080,7 +2080,7 @@ static int test_external( hid_t fapl ) } } - TESTING2("external file use"); + TESTING_2("external file use"); /* create a new file */ h5_fixname(FILENAME[3], fapl, filename, sizeof filename); -- cgit v0.12