From 9344a13bed1bd72df197f4297da56bd86f948fcc Mon Sep 17 00:00:00 2001 From: David Boddie Date: Thu, 1 Aug 2019 16:00:59 +0200 Subject: [PATCH 1/2] Use headless init functions to prevent test breakage --- tests/eek-simple-test.c | 2 +- tests/eek-xml-test.c | 2 +- tests/test-keymap-generation.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/eek-simple-test.c b/tests/eek-simple-test.c index 8750026d..d1cadd77 100644 --- a/tests/eek-simple-test.c +++ b/tests/eek-simple-test.c @@ -41,7 +41,7 @@ test_create (void) int main (int argc, char **argv) { - gtk_test_init (&argc, &argv, NULL); + g_test_init (&argc, &argv, NULL); g_test_add_func ("/eek-simple-test/create", test_create); return g_test_run (); } diff --git a/tests/eek-xml-test.c b/tests/eek-xml-test.c index 9b6d89f4..5f2c90b2 100644 --- a/tests/eek-xml-test.c +++ b/tests/eek-xml-test.c @@ -46,7 +46,7 @@ test_output_parse (void) int main (int argc, char **argv) { - gtk_test_init (&argc, &argv, NULL); + g_test_init (&argc, &argv, NULL); g_test_add_func ("/eek-xml-test/output-parse", test_output_parse); diff --git a/tests/test-keymap-generation.c b/tests/test-keymap-generation.c index 60e7d518..ad3f5cec 100644 --- a/tests/test-keymap-generation.c +++ b/tests/test-keymap-generation.c @@ -63,7 +63,7 @@ test_check_xkb (void) int main (int argc, char **argv) { - gtk_test_init (&argc, &argv, NULL); + g_test_init (&argc, &argv, NULL); g_test_add_func ("/test-keymap-generation/check-xkb", test_check_xkb); From ad5e4f58bbd3f3119e3b2b5e428f1d23e613aea9 Mon Sep 17 00:00:00 2001 From: David Boddie Date: Thu, 1 Aug 2019 18:15:42 +0200 Subject: [PATCH 2/2] Remove use of xvfb to check that the tests run headless --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3dce6ad5..79dbb366 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,4 +28,4 @@ test: dependencies: - build_meson script: - - xvfb-run -s -noreset ninja -C _build test + - ninja -C _build test