diff options
| author | Albert Cheng <acheng@hdfgroup.org> | 2010-01-27 21:38:45 (GMT) |
|---|---|---|
| committer | Albert Cheng <acheng@hdfgroup.org> | 2010-01-27 21:38:45 (GMT) |
| commit | be5b92837fe02ba79521396e3751632b9ff4259a (patch) | |
| tree | 1e185001e096daa10e3fcc722686fef9587b764a /test/h5test.h | |
| parent | 581d57ba7b2a673d118facdde3adcd32d60eb4dc (diff) | |
| download | hdf5-be5b92837fe02ba79521396e3751632b9ff4259a.zip hdf5-be5b92837fe02ba79521396e3751632b9ff4259a.tar.gz hdf5-be5b92837fe02ba79521396e3751632b9ff4259a.tar.bz2 | |
[svn-r18173] Bug ID 1753: added macro version of GetTestVerbosity.
The previous implementation did not work for WIndows.
Moved the macro definition of HDGetTestVerbosity from testhdf5.h
to h5test.h.
Removed as much as possible macro definitions that use HDGetTestVerbosity
directly.
Tested: Jam (serial and parallel). Did not run h5committest since this
is a trival change that is portable.
Diffstat (limited to 'test/h5test.h')
| -rw-r--r-- | test/h5test.h | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/test/h5test.h b/test/h5test.h index 315b504..61e7d95 100644 --- a/test/h5test.h +++ b/test/h5test.h @@ -61,11 +61,16 @@ * Verbose queries * Only None needs an exact match. The rest are at least as much. */ -#define VERBOSE_NONE (GetTestVerbosity()==VERBO_NONE) -#define VERBOSE_DEF (GetTestVerbosity()>=VERBO_DEF) -#define VERBOSE_LO (GetTestVerbosity()>=VERBO_LO) -#define VERBOSE_MED (GetTestVerbosity()>=VERBO_MED) -#define VERBOSE_HI (GetTestVerbosity()>=VERBO_HI) + +/* A macro version of HDGetTestVerbosity(). */ +/* Should be used internally by the libtest.a only. */ +#define HDGetTestVerbosity() (TestVerbosity) + +#define VERBOSE_NONE (HDGetTestVerbosity()==VERBO_NONE) +#define VERBOSE_DEF (HDGetTestVerbosity()>=VERBO_DEF) +#define VERBOSE_LO (HDGetTestVerbosity()>=VERBO_LO) +#define VERBOSE_MED (HDGetTestVerbosity()>=VERBO_MED) +#define VERBOSE_HI (HDGetTestVerbosity()>=VERBO_HI) /* * Test controls definitions. @@ -189,6 +194,9 @@ H5TEST_DLL void h5_dump_info_object(MPI_Info info); H5TEST_DLL char* getenv_all(MPI_Comm comm, int root, const char* name); #endif +/* Extern global variables */ +H5TEST_DLLVAR int TestVerbosity; + #ifdef __cplusplus } #endif |