From 2d533a465a95227cd9a06573027f60a42c8cbd42 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Thu, 25 Aug 2011 12:05:54 +0100 Subject: [PATCH] Fix command test wrt gnutls initialize & fix debugging The VIR_TEST_DEBUG and VIR_TEST_VERBOSE env vars did not work because we replaced 'environ' with 'newenv'. Simply calling virTestGetDebug/Verbose() before replacing the 'environ' ensures we have processed the env variables. The gnutls initialization code opens /dev/urandom and keeps that FD around for later use. We have code which kills off FDs 3-5 to avoid interfereing with our test case. Move the virInitialize call before this point, so it kills off the gnutls /dev/urandom FD which is irrelevant for testing purposes * tests/commandtest.c: Fix test debugging & make it robust against opened FDs --- tests/commandtest.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/commandtest.c b/tests/commandtest.c index 4a798fc91e..dd6c24887d 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -773,6 +773,13 @@ mymain(void) setpgid(0, 0); setsid(); + + /* Prime the debug/verbose settings from the env vars, + * since we're about to reset 'environ' */ + virTestGetDebug(); + virTestGetVerbose(); + + virInitialize(); /* Kill off any inherited fds that might interfere with our * testing. */ fd = 3; @@ -782,8 +789,6 @@ mymain(void) fd = 5; VIR_FORCE_CLOSE(fd); - virInitialize(); - environ = (char **)newenv; # define DO_TEST(NAME) \