diff options
author | Albert Cheng <acheng@hdfgroup.org> | 2004-01-22 20:57:34 (GMT) |
---|---|---|
committer | Albert Cheng <acheng@hdfgroup.org> | 2004-01-22 20:57:34 (GMT) |
commit | 7f5fd94b565ca3a7f0bcdf0d11100c556048ff35 (patch) | |
tree | 550895f47fe521c80aa87e754e5da5ad30e67087 /test/testhdf5.h | |
parent | 618e7e7fbb5d7112ba38eb680d4b2a5b5c15adc1 (diff) | |
download | hdf5-7f5fd94b565ca3a7f0bcdf0d11100c556048ff35.zip hdf5-7f5fd94b565ca3a7f0bcdf0d11100c556048ff35.tar.gz hdf5-7f5fd94b565ca3a7f0bcdf0d11100c556048ff35.tar.bz2 |
[svn-r8084] Purpose:
Improvement.
Description:
Verbosity level were specified by numbers which are not meaningful
and prone to typos.
Solution:
Adapted the Verbosity predefined level symbols from HDF4
and changed all numberic verbosity to symbolic values.
(Still need to convert some left over macros like MESSAGE.)
Platforms tested:
Eirene.
No h5committest since this is trivial.
Misc. update:
Diffstat (limited to 'test/testhdf5.h')
-rw-r--r-- | test/testhdf5.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/test/testhdf5.h b/test/testhdf5.h index 5a12cc1..6430b54 100644 --- a/test/testhdf5.h +++ b/test/testhdf5.h @@ -33,7 +33,7 @@ /* Used to make certain a return value _is_not_ a value */ #ifdef H5_WANT_H5_V1_6_COMPAT #define CHECK(ret, val, where) do { \ - if (GetTestVerbosity()>9) print_func(" Call to routine: %15s at line %4d " \ + if (GetTestVerbosity()>=VERBO_HI) print_func(" Call to routine: %15s at line %4d " \ "in %s returned %ld \n", \ where, (int)__LINE__, __FILE__, \ (long)(ret)); \ @@ -45,7 +45,7 @@ } while(0) #define CHECK_I(ret,where) { \ - if (GetTestVerbosity()>9) { \ + if (GetTestVerbosity()>=VERBO_HI) { \ print_func(" Call to routine: %15s at line %4d in %s returned %ld\n", \ (where), (int)__LINE__, __FILE__, (long)(ret)); \ } \ @@ -57,7 +57,7 @@ } #define CHECK_PTR(ret,where) { \ - if (GetTestVerbosity()>9) { \ + if (GetTestVerbosity()>=VERBO_HI) { \ print_func(" Call to routine: %15s at line %4d in %s returned %p\n", \ (where), (int)__LINE__, __FILE__, (ret)); \ } \ @@ -70,7 +70,7 @@ /* Used to make certain a return value _is_ a value */ #define VERIFY(x, val, where) do { \ - if (GetTestVerbosity()>9) { \ + if (GetTestVerbosity()>=VERBO_HI) { \ print_func(" Call to routine: %15s at line %4d in %s had value " \ "%ld \n", (where), (int)__LINE__, __FILE__, (long)(x)); \ } \ @@ -83,11 +83,11 @@ /* Used to document process through a test and to check for errors */ #define RESULT(ret,func) do { \ - if (GetTestVerbosity()>8) { \ + if (GetTestVerbosity()>VERBO_MED) { \ print_func(" Call to routine: %15s at line %4d in %s returned " \ "%ld\n", func, (int)__LINE__, __FILE__, (long)(ret)); \ } \ - if (GetTestVerbosity()>9) \ + if (GetTestVerbosity()>=VERBO_HI) \ H5Eprint(stdout); \ if ((ret) == FAIL) { \ TestErrPrintf("*** UNEXPECTED RETURN from %s is %ld at line %4d " \ @@ -98,7 +98,7 @@ #else #define CHECK(ret, val, where) do { \ - if (GetTestVerbosity()>9) print_func(" Call to routine: %15s at line %4d " \ + if (GetTestVerbosity()>=VERBO_HI) print_func(" Call to routine: %15s at line %4d " \ "in %s returned %ld \n", \ where, (int)__LINE__, __FILE__, \ (long)(ret)); \ @@ -110,7 +110,7 @@ } while(0) #define CHECK_I(ret,where) { \ - if (GetTestVerbosity()>9) { \ + if (GetTestVerbosity()>=VERBO_HI) { \ print_func(" Call to routine: %15s at line %4d in %s returned %ld\n", \ (where), (int)__LINE__, __FILE__, (long)(ret)); \ } \ @@ -122,7 +122,7 @@ } #define CHECK_PTR(ret,where) { \ - if (GetTestVerbosity()>9) { \ + if (GetTestVerbosity()>=VERBO_HI) { \ print_func(" Call to routine: %15s at line %4d in %s returned %p\n", \ (where), (int)__LINE__, __FILE__, (ret)); \ } \ @@ -135,7 +135,7 @@ /* Used to make certain a return value _is_ a value */ #define VERIFY(x, val, where) do { \ - if (GetTestVerbosity()>9) { \ + if (GetTestVerbosity()>=VERBO_HI) { \ print_func(" Call to routine: %15s at line %4d in %s had value " \ "%ld \n", (where), (int)__LINE__, __FILE__, (long)(x)); \ } \ @@ -148,11 +148,11 @@ /* Used to document process through a test and to check for errors */ #define RESULT(ret,func) do { \ - if (GetTestVerbosity()>8) { \ + if (GetTestVerbosity()>VERBO_MED) { \ print_func(" Call to routine: %15s at line %4d in %s returned " \ "%ld\n", func, (int)__LINE__, __FILE__, (long)(ret)); \ } \ - if (GetTestVerbosity()>9) \ + if (GetTestVerbosity()>=VERBO_HI) \ H5Eprint(H5E_DEFAULT, stdout); \ if ((ret) == FAIL) { \ TestErrPrintf("*** UNEXPECTED RETURN from %s is %ld at line %4d " \ |