diff mbox

libqtest: dump child invocation when QTEST_LOG set

Message ID 1462359562-22538-1-git-send-email-alex.bennee@linaro.org
State New
Headers show

Commit Message

Alex Bennée May 4, 2016, 10:59 a.m. UTC 
The QTEST_LOG environment is used for debugging qtest interactions with
a child process. When it is defined we now also dump the invocation line
to stderr to make it easier for people to see how QEMU was invoked.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

---
 tests/libqtest.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

-- 
2.7.4

Comments

Alex Bennée Aug. 9, 2016, 2:42 p.m. UTC | #1 
Alex Bennée <alex.bennee@linaro.org> writes:

> The QTEST_LOG environment is used for debugging qtest interactions with

> a child process. When it is defined we now also dump the invocation line

> to stderr to make it easier for people to see how QEMU was invoked.

>

> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

> ---

>  tests/libqtest.c | 6 +++++-

>  1 file changed, 5 insertions(+), 1 deletion(-)

>

> diff --git a/tests/libqtest.c b/tests/libqtest.c

> index b12a9e4..dd94abf 100644

> --- a/tests/libqtest.c

> +++ b/tests/libqtest.c

> @@ -171,6 +171,7 @@ QTestState *qtest_init(const char *extra_args)

>

>      s->qemu_pid = fork();

>      if (s->qemu_pid == 0) {

> +        bool qtest_log = getenv("QTEST_LOG");

>          setenv("QEMU_AUDIO_DRV", "none", true);

>          command = g_strdup_printf("exec %s "

>                                    "-qtest unix:%s,nowait "

> @@ -179,9 +180,12 @@ QTestState *qtest_init(const char *extra_args)

>                                    "-machine accel=qtest "

>                                    "-display none "

>                                    "%s", qemu_binary, socket_path,

> -                                  getenv("QTEST_LOG") ? "/dev/fd/2" : "/dev/null",

> +                                  qtest_log ? "/dev/fd/2" : "/dev/null",

>                                    qmp_socket_path,

>                                    extra_args ?: "");

> +        if (qtest_log) {

> +            fprintf(stderr, "%s\n", command);

> +        }

>          execlp("/bin/sh", "sh", "-c", command, NULL);

>          exit(1);

>      }


Ping?

--
Alex Bennée
diff mbox

Patch

diff --git a/tests/libqtest.c b/tests/libqtest.c
index b12a9e4..dd94abf 100644
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
@@ -171,6 +171,7 @@  QTestState *qtest_init(const char *extra_args)
 
     s->qemu_pid = fork();
     if (s->qemu_pid == 0) {
+        bool qtest_log = getenv("QTEST_LOG");
         setenv("QEMU_AUDIO_DRV", "none", true);
         command = g_strdup_printf("exec %s "
                                   "-qtest unix:%s,nowait "
@@ -179,9 +180,12 @@  QTestState *qtest_init(const char *extra_args)
                                   "-machine accel=qtest "
                                   "-display none "
                                   "%s", qemu_binary, socket_path,
-                                  getenv("QTEST_LOG") ? "/dev/fd/2" : "/dev/null",
+                                  qtest_log ? "/dev/fd/2" : "/dev/null",
                                   qmp_socket_path,
                                   extra_args ?: "");
+        if (qtest_log) {
+            fprintf(stderr, "%s\n", command);
+        }
         execlp("/bin/sh", "sh", "-c", command, NULL);
         exit(1);
     }