Fix use of VIR_TEST_DEBUG var when OOM testing is not enabled & surpress more valgrind warnings

This commit is contained in:
Daniel P. Berrange 2008-07-09 10:27:17 +00:00
parent 08397146eb
commit c207f75890
3 changed files with 90 additions and 1 deletions

View File

@ -1,3 +1,10 @@
Wed Jul 9 11:25:44 BST 2008 Daniel P. Berrange <berrange@redhat.com>
* tests/testutils.c: Ensure VIR_TEST_DEBUG is used even when
OOM testing is not compiled in
* tests/.valgrind.supp: Supress some bogus warnings caused by
global data we don't expect to ever free.
Wed Jul 9 11:16:44 BST 2008 Daniel P. Berrange <berrange@redhat.com>
* tests/virshtest.c: Remove legacy debugging output

View File

@ -82,3 +82,81 @@
fun:reader_loop
fun:main
}
{
xenDriverGlobalRegexes1
Memcheck:Leak
fun:*
fun:regcomp
fun:xenHypervisorInit
fun:xenUnifiedRegister
fun:virInitialize
fun:virConnectOpenReadOnly
fun:testCompareHelper
fun:virtTestRun
fun:mymain
fun:virtTestMain
}
{
xenDriverGlobalRegexes2
Memcheck:Leak
fun:*
fun:*
fun:regcomp
fun:xenHypervisorInit
fun:xenUnifiedRegister
fun:virInitialize
fun:virConnectOpenReadOnly
fun:testCompareHelper
fun:virtTestRun
fun:mymain
fun:virtTestMain
}
{
xenDriverGlobalRegexes3
Memcheck:Leak
fun:*
fun:*
fun:*
fun:regcomp
fun:xenHypervisorInit
fun:xenUnifiedRegister
fun:virInitialize
fun:virConnectOpenReadOnly
fun:testCompareHelper
fun:virtTestRun
fun:mymain
fun:virtTestMain
}
{
xenDriverGlobalRegexes4
Memcheck:Leak
fun:*
fun:*
fun:*
fun:*
fun:regcomp
fun:xenHypervisorInit
fun:xenUnifiedRegister
fun:virInitialize
fun:virConnectOpenReadOnly
fun:testCompareHelper
fun:virtTestRun
fun:mymain
fun:virtTestMain
}
{
libXMLGlobals1
Memcheck:Leak
fun:malloc
fun:xmlNewMutex
fun:xmlInitGlobals
fun:xmlInitParser
fun:xmlParseDocument
obj:/usr/lib64/libxml2.so.2.6.32
fun:virDomainDefParseString
fun:testOpen
fun:do_open
fun:testCompareHelper
fun:virtTestRun
fun:mymain
}

View File

@ -321,20 +321,24 @@ int virtTestMain(int argc,
char **argv,
int (*func)(int, char **))
{
char *debugStr;
#if TEST_OOM
int ret;
int approxAlloc = 0;
int n;
char *oomStr = NULL, *debugStr;
char *oomStr = NULL;
int oomCount;
int mp = 0;
pid_t *workers;
int worker = 0;
#endif
if ((debugStr = getenv("VIR_TEST_DEBUG")) != NULL) {
if (virStrToLong_ui(debugStr, NULL, 10, &testDebug) < 0)
testDebug = 0;
}
#if TEST_OOM
if ((oomStr = getenv("VIR_TEST_OOM")) != NULL) {
if (virStrToLong_i(oomStr, NULL, 10, &oomCount) < 0)
oomCount = 0;