pxcloud/spice
6
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/spice synced 2026-08-15 00:08:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

test-display-base: Port to Windows

Browse Source 
Use GLib function to launch and wait process exit.

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Frediano Ziglio 2018-06-24 21:41:34 +01:00
parent f5103aed1f
commit 5cbdf1a235
2 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/tests/regression-test.py
View File

@ -1,7 +1,7 @@
#!/usr/bin/python
from subprocess import PIPE, Popen
import Image
import ImageChops
from PIL import Image
from PIL import ImageChops
def spicy_screenshot():

37
server/tests/test-display-base.c
View File

@ -89,17 +89,19 @@ static int has_automated_tests = 0; //automated test flag
// between multiple threads so use a mutex
static pthread_mutex_t timer_mutex = PTHREAD_MUTEX_INITIALIZER;
__attribute__((noreturn))
static void sigchld_handler(SPICE_GNUC_UNUSED int signal_num) // wait for the child process and exit
// wait for the child process and exit
static void child_exited(GPid pid, gint status, gpointer user_data)
{
int status;
wait(&status);
g_spawn_close_pid(pid);
exit(0);
}
static void regression_test(void)
{
pid_t pid;
GPid pid;
GError *error = NULL;
gboolean retval;
gchar **argv;
if (--rects != 0) {
return;
@ -111,17 +113,17 @@ static void regression_test(void)
return;
}
pid = fork();
if (pid == 0) {
char buf[PATH_MAX];
char *argv[] = { NULL };
char *envp[] = {buf, NULL};
argv = g_strsplit("./regression-test.py", " ", -1);
retval = g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH|G_SPAWN_DO_NOT_REAP_CHILD,
NULL, NULL, &pid, &error);
g_strfreev(argv);
g_assert(retval);
snprintf(buf, sizeof(buf), "PATH=%s", getenv("PATH"));
execve("regression-test.py", argv, envp);
} else if (pid > 0) {
return;
}
GSource *source = g_child_watch_source_new(pid);
g_source_set_callback(source, (GSourceFunc)(void*)child_exited, NULL, NULL);
guint id = g_source_attach(source, basic_event_loop_get_context());
g_assert(id != 0);
g_source_unref(source);
}
static void set_cmd(QXLCommandExt *ext, uint32_t type, QXLPHYSICAL data)
@ -967,11 +969,6 @@ void test_destroy(Test *test)
static void init_automated(void)
{
struct sigaction sa;
memset(&sa, 0, sizeof sa);
sa.sa_handler = &sigchld_handler;
sigaction(SIGCHLD, &sa, NULL);
}
static __attribute__((noreturn))