[svn-r8094] Purpose:

New feature.

Description:
Added function SetTestVerbosity() so that other applications can
set the verbosity explicitedly without the whole testframe taking
over.
Added Verbose queries shorthands to make code more readable and
easier to change the levels of low, medium and high.

Platforms tested:
Eirene (both serial and parallel).

Misc. update:
This commit is contained in:
Albert Cheng 2004-01-22 18:05:55 -05:00
parent 3300140c70
commit cc17167703
3 changed files with 28 additions and 4 deletions

View File

@ -57,6 +57,16 @@
#define VERBO_MED 7 /* Medium */
#define VERBO_HI 9 /* High */
/*
* 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)
/*
* This contains the filename prefix specificied as command line option for
* the parallel test files.

View File

@ -170,13 +170,13 @@ void TestParseCmdLine(int argc, char *argv[], int *Summary, int *CleanUp)
if ((argc > CLLoop + 1) && ((HDstrcmp(argv[CLLoop], "-verbose") == 0) ||
(HDstrcmp(argv[CLLoop], "-v") == 0))) {
if (argv[CLLoop + 1][0] == 'l')
Verbosity = VERBO_LO;
SetTestVerbosity(VERBO_LO);
else if (argv[CLLoop + 1][0] == 'm')
Verbosity = VERBO_MED;
SetTestVerbosity(VERBO_MED);
else if (argv[CLLoop + 1][0] == 'h')
Verbosity = VERBO_HI;
SetTestVerbosity(VERBO_HI);
else
Verbosity = atoi(argv[CLLoop + 1]);
SetTestVerbosity(atoi(argv[CLLoop + 1]));
} /* end if */
if ((argc > CLLoop) && ((HDstrcmp(argv[CLLoop], "-summary") == 0) ||
(HDstrcmp(argv[CLLoop], "-s") == 0)))
@ -307,6 +307,19 @@ int GetTestVerbosity(void)
return(Verbosity);
}
/*
* Set the verbosity level for the testing framework.
* Return previous verbosity level.
*/
int SetTestVerbosity(int new)
{
int old;
old = Verbosity;
Verbosity = new;
return(old);
}
/*
* Retrieve the number of testing errors for the testing framework

View File

@ -187,6 +187,7 @@ H5TEST_DLL void TestSummary(void);
H5TEST_DLL void TestCleanup(void);
H5TEST_DLL void TestInit(void);
H5TEST_DLL int GetTestVerbosity(void);
H5TEST_DLL int SetTestVerbosity(int new);
H5TEST_DLL int GetTestNumErrs(void);
H5TEST_DLL int TestErrPrintf(const char *format, ...);