Commit 21f80286 authored by Richard Henderson's avatar Richard Henderson Committed by Thomas Huth
Browse files

tests: Exit boot-serial-test loop if child dies 



There's no point in waiting 5 full minutes when there will be
no more output.  Compute timeout based on elapsed wall clock
time instead of N * delays, as the delay is a minimum sleep time.

Cc: Thomas Huth <thuth@redhat.com>
Cc: Laurent Vivier <lvivier@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarWainer dos Santos Moschetta <wainersm@redhat.com>
[thuth: Replaced global_qtest with local qts variable]
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
parent 43497c43

tests/boot-serial-test.c

+15 −5
Original line number Diff line number Diff line
@@ -128,13 +128,14 @@ static testdef_t tests[] = { 
    { NULL }

};



static bool check_guest_output(const testdef_t *test, int fd)

static bool check_guest_output(QTestState *qts, const testdef_t *test, int fd)

{

    int i, nbr = 0, pos = 0, ccnt;

    int nbr = 0, pos = 0, ccnt;

    time_t now, start = time(NULL);

    char ch;



    /* Poll serial output... Wait at most 360 seconds */

    for (i = 0; i < 36000; ++i) {

    /* Poll serial output... */

    while (1) {

        ccnt = 0;

        while (ccnt++ < 512 && (nbr = read(fd, &ch, 1)) == 1) {

            if (ch == test->expect[pos]) {
@@ -148,6 +149,15 @@ static bool check_guest_output(const testdef_t *test, int fd) 
            }

        }

        g_assert(nbr >= 0);

        /* Wait only if the child is still alive.  */

        if (!qtest_probe_child(qts)) {

            break;

        }

        /* Wait at most 360 seconds.  */

        now = time(NULL);

        if (now - start >= 360) {

            break;

        }

        g_usleep(10000);

    }
@@ -199,7 +209,7 @@ static void test_machine(const void *data) 
        unlink(codetmp);

    }



    if (!check_guest_output(test, ser_fd)) {

    if (!check_guest_output(qts, test, ser_fd)) {

        g_error("Failed to find expected string. Please check '%s'",

                serialtmp);

    }

tests/libqtest.c

+45 −27
Original line number Diff line number Diff line
@@ -39,10 +39,11 @@ struct QTestState 
{

    int fd;

    int qmp_fd;

    bool irq_level[MAX_IRQ];

    GString *rx;

    pid_t qemu_pid;  /* our child QEMU process */

    int wstatus;

    bool big_endian;

    bool irq_level[MAX_IRQ];

    GString *rx;

};



static GHookList abrt_hooks;
@@ -96,20 +97,37 @@ static int socket_accept(int sock) 
    return ret;

}



static void kill_qemu(QTestState *s)

bool qtest_probe_child(QTestState *s)

{

    if (s->qemu_pid != -1) {

        int wstatus = 0;

        pid_t pid;

    pid_t pid = s->qemu_pid;



        kill(s->qemu_pid, SIGTERM);

        TFR(pid = waitpid(s->qemu_pid, &wstatus, 0));

    if (pid != -1) {

        pid = waitpid(pid, &s->wstatus, WNOHANG);

        if (pid == 0) {

            return true;

        }

        s->qemu_pid = -1;

    }

    return false;

}



static void kill_qemu(QTestState *s)

{

    pid_t pid = s->qemu_pid;

    int wstatus;



    /* Skip wait if qtest_probe_child already reaped.  */

    if (pid != -1) {

        kill(pid, SIGTERM);

        TFR(pid = waitpid(s->qemu_pid, &s->wstatus, 0));

        assert(pid == s->qemu_pid);

    }



    /*

     * We expect qemu to exit with status 0; anything else is

     * fishy and should be logged with as much detail as possible.

     */

    wstatus = s->wstatus;

    if (wstatus) {

        if (WIFEXITED(wstatus)) {

            fprintf(stderr, "%s:%d: kill_qemu() tried to terminate QEMU "
@@ -127,7 +145,6 @@ static void kill_qemu(QTestState *s) 
        abort();

    }

}

}



static void kill_qemu_hook_func(void *s)

{
@@ -228,6 +245,7 @@ QTestState *qtest_init_without_qmp_handshake(const char *extra_args) 


    g_test_message("starting QEMU: %s", command);



    s->wstatus = 0;

    s->qemu_pid = fork();

    if (s->qemu_pid == 0) {

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

tests/libqtest.h

+8 −0
Original line number Diff line number Diff line
@@ -1011,4 +1011,12 @@ bool qmp_rsp_is_err(QDict *rsp); 
 */

void qmp_assert_error_class(QDict *rsp, const char *class);



/**

 * qtest_probe_child:

 * @s: QTestState instance to operate on.

 *

 * Returns: true if the child is still alive.

 */

bool qtest_probe_child(QTestState *s);



#endif