From: Daniel P. Berrange <berrange@redhat.com>
Date: Mon, 6 Jul 2009 14:03:31 +0000 (+0100)
Subject: Make it easier to debug tests running programs
X-Git-Tag: v0.7.0~229
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=561e60732f5ecba9f1f6ec3fe8864f0663773636;p=thirdparty%2Flibvirt.git

Make it easier to debug tests running programs

	* tests/testutils.c: Don't discard stderr when running
	external programs during tests
---

diff --git a/tests/testutils.c b/tests/testutils.c
index 2477fe256b..7a1dbdcdd8 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -156,7 +156,6 @@ void virtTestCaptureProgramExecChild(const char *const argv[],
     int i;
     int open_max;
     int stdinfd = -1;
-    int stderrfd = -1;
     const char *const env[] = {
         "LANG=C",
 #if WITH_DRIVER_MODULES
@@ -167,13 +166,10 @@ void virtTestCaptureProgramExecChild(const char *const argv[],
 
     if ((stdinfd = open("/dev/null", O_RDONLY)) < 0)
         goto cleanup;
-    if ((stderrfd = open("/dev/null", O_WRONLY)) < 0)
-        goto cleanup;
 
     open_max = sysconf (_SC_OPEN_MAX);
     for (i = 0; i < open_max; i++) {
         if (i != stdinfd &&
-            i != stderrfd &&
             i != pipefd)
             close(i);
     }
@@ -182,7 +178,7 @@ void virtTestCaptureProgramExecChild(const char *const argv[],
         goto cleanup;
     if (dup2(pipefd, STDOUT_FILENO) != STDOUT_FILENO)
         goto cleanup;
-    if (dup2(stderrfd, STDERR_FILENO) != STDERR_FILENO)
+    if (dup2(pipefd, STDERR_FILENO) != STDERR_FILENO)
         goto cleanup;
 
     /* SUS is crazy here, hence the cast */
@@ -191,8 +187,6 @@ void virtTestCaptureProgramExecChild(const char *const argv[],
  cleanup:
     if (stdinfd != -1)
         close(stdinfd);
-    if (stderrfd != -1)
-        close(stderrfd);
 }
 
 int virtTestCaptureProgramOutput(const char *const argv[],