Commit c28afa76 authored by Tomáš Golembiovský's avatar Tomáš Golembiovský Committed by Michael Roth
Browse files

test-qga: pass environemnt to qemu-ga 



Modify fixture_setup() to pass environemnt variables to spawned qemu-ga
instance.

Signed-off-by: default avatarTomáš Golembiovský <tgolembi@redhat.com>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: default avatarMichael Roth <mdroth@linux.vnet.ibm.com>
parent 9848f797

tests/test-qga.c

+4 −4
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static void qga_watch(GPid pid, gint status, gpointer user_data) 
}



static void

fixture_setup(TestFixture *fixture, gconstpointer data)

fixture_setup(TestFixture *fixture, gconstpointer data, gchar **envp)

{

    const gchar *extra_arg = data;

    GError *error = NULL;
@@ -67,7 +67,7 @@ fixture_setup(TestFixture *fixture, gconstpointer data) 
    g_shell_parse_argv(cmd, NULL, &argv, &error);

    g_assert_no_error(error);



    g_spawn_async(fixture->test_dir, argv, NULL,

    g_spawn_async(fixture->test_dir, argv, envp,

                  G_SPAWN_SEARCH_PATH|G_SPAWN_DO_NOT_REAP_CHILD,

                  NULL, NULL, &fixture->pid, &error);

    g_assert_no_error(error);
@@ -707,7 +707,7 @@ static void test_qga_blacklist(gconstpointer data) 
    QDict *ret, *error;

    const gchar *class, *desc;



    fixture_setup(&fix, "-b guest-ping,guest-get-time");

    fixture_setup(&fix, "-b guest-ping,guest-get-time", NULL);



    /* check blacklist */

    ret = qmp_fd(fix.fd, "{'execute': 'guest-ping'}");
@@ -943,7 +943,7 @@ int main(int argc, char **argv) 


    setlocale (LC_ALL, "");

    g_test_init(&argc, &argv, NULL);

    fixture_setup(&fix, NULL);

    fixture_setup(&fix, NULL, NULL);



    g_test_add_data_func("/qga/sync-delimited", &fix, test_qga_sync_delimited);

    g_test_add_data_func("/qga/sync", &fix, test_qga_sync);