From 306e36185c34c486d09905fc4eb551da4b89bc37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Thu, 12 Apr 2012 12:54:14 -0400 Subject: [PATCH] tests: Add an initial weston integration test The idea here is to make weston load test cases as a module and then run test cases from within weston. --- src/compositor.c | 36 ++++++++++++++------------ tests/Makefile.am | 18 ++++++++++--- tests/surface-test.c | 49 ++++++++++++++++++++++++++++++++++++ tests/test-runner.c | 60 ++++++++++++++++++++++++++++++++++++++++++++ tests/test-runner.h | 25 ++++++++++++++++++ tests/weston-test | 4 +++ 6 files changed, 173 insertions(+), 19 deletions(-) create mode 100644 tests/surface-test.c create mode 100644 tests/test-runner.c create mode 100644 tests/test-runner.h create mode 100644 tests/weston-test diff --git a/src/compositor.c b/src/compositor.c index 768477de..afa0848b 100644 --- a/src/compositor.c +++ b/src/compositor.c @@ -2630,14 +2630,14 @@ int main(int argc, char *argv[]) struct wl_event_loop *loop; struct sigaction segv_action; void *shell_module, *backend_module, *xserver_module; - int (*shell_init)(struct weston_compositor *ec); - int (*xserver_init)(struct weston_compositor *ec); + int (*module_init)(struct weston_compositor *ec); struct weston_compositor *(*backend_init)(struct wl_display *display, int argc, char *argv[]); int i; char *backend = NULL; char *shell = NULL; + char *module = NULL; int32_t idle_time = 300; int32_t xserver; char *socket_name = NULL; @@ -2657,6 +2657,7 @@ int main(int argc, char *argv[]) { WESTON_OPTION_STRING, "socket", 'S', &socket_name }, { WESTON_OPTION_INTEGER, "idle-time", 'i', &idle_time }, { WESTON_OPTION_BOOLEAN, "xserver", 0, &xserver }, + { WESTON_OPTION_STRING, "module", 0, &module }, }; argc = parse_options(core_options, @@ -2696,17 +2697,10 @@ int main(int argc, char *argv[]) parse_config_file(config_file, cs, ARRAY_LENGTH(cs), shell); free(config_file); - if (!shell) - shell = "desktop-shell.so"; - backend_init = load_module(backend, "backend_init", &backend_module); if (!backend_init) exit(EXIT_FAILURE); - shell_init = load_module(shell, "shell_init", &shell_module); - if (!shell_init) - exit(EXIT_FAILURE); - ec = backend_init(display, argc, argv); if (ec == NULL) { fprintf(stderr, "failed to create compositor\n"); @@ -2721,15 +2715,25 @@ int main(int argc, char *argv[]) ec->option_idle_time = idle_time; ec->idle_time = idle_time; - xserver_init = NULL; + module_init = NULL; if (xserver) - xserver_init = load_module("xserver-launcher.so", - "weston_xserver_init", - &xserver_module); - if (xserver_init) - xserver_init(ec); + module_init = load_module("xserver-launcher.so", + "weston_xserver_init", + &xserver_module); + if (module_init && module_init(ec) < 0) + exit(EXIT_FAILURE); + + if (!shell) + shell = "desktop-shell.so"; + module_init = load_module(shell, "shell_init", &shell_module); + if (!module_init || module_init(ec) < 0) + exit(EXIT_FAILURE); + - if (shell_init(ec) < 0) + module_init = NULL; + if (module) + module_init = load_module(module, "module_init", NULL); + if (module_init && module_init(ec) < 0) exit(EXIT_FAILURE); if (wl_display_add_socket(display, socket_name)) { diff --git a/tests/Makefile.am b/tests/Makefile.am index f9c47545..19b3f8b7 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,12 +1,24 @@ -TESTS = $(check_PROGRAMS) +TESTS = surface-test.la -check_PROGRAMS = matrix-test +TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/weston-test -noinst_PROGRAMS = setbacklight +export abs_builddir AM_CFLAGS = $(GCC_CFLAGS) AM_CPPFLAGS = -I$(top_srcdir)/src -DUNIT_TEST $(COMPOSITOR_CFLAGS) + +check_LTLIBRARIES = $(TESTS) + +AM_LDFLAGS = -module -avoid-version -rpath $(libdir) + +test_runner_src = test-runner.c test-runner.h + +surface_test_la_SOURCES = surface-test.c $(test_runner_src) + + +noinst_PROGRAMS = setbacklight matrix-test + matrix_test_SOURCES = \ matrix-test.c \ $(top_srcdir)/src/matrix.c \ diff --git a/tests/surface-test.c b/tests/surface-test.c new file mode 100644 index 00000000..f5e5a990 --- /dev/null +++ b/tests/surface-test.c @@ -0,0 +1,49 @@ +/* + * Copyright © 2012 Intel Corporation + * + * Permission to use, copy, modify, distribute, and sell this software and + * its documentation for any purpose is hereby granted without fee, provided + * that the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of the copyright holders not be used in + * advertising or publicity pertaining to distribution of the software + * without specific, written prior permission. The copyright holders make + * no representations about the suitability of this software for any + * purpose. It is provided "as is" without express or implied warranty. + * + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS + * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY + * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER + * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF + * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN + * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include +#include +#include + +#include "../src/compositor.h" +#include "test-runner.h" + +TEST(surface_transform) +{ + struct weston_surface *surface; + int32_t x, y; + + surface = weston_surface_create(compositor); + weston_surface_configure(surface, 100, 100, 200, 200); + weston_surface_update_transform(surface); + weston_surface_to_global(surface, 20, 20, &x, &y); + + fprintf(stderr, "20,20 maps to %d, %d\n", x, y); + assert(x == 120 && y == 120); + + weston_surface_set_position(surface, 150, 300); + weston_surface_update_transform(surface); + weston_surface_to_global(surface, 50, 40, &x, &y); + assert(x == 200 && y == 340); + + wl_display_terminate(compositor->wl_display); +} diff --git a/tests/test-runner.c b/tests/test-runner.c new file mode 100644 index 00000000..fd85a6ce --- /dev/null +++ b/tests/test-runner.c @@ -0,0 +1,60 @@ +/* + * Copyright © 2012 Intel Corporation + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that copyright + * notice and this permission notice appear in supporting documentation, and + * that the name of the copyright holders not be used in advertising or + * publicity pertaining to distribution of the software without specific, + * written prior permission. The copyright holders make no representations + * about the suitability of this software for any purpose. It is provided "as + * is" without express or implied warranty. + * + * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * OF THIS SOFTWARE. + */ + +#define _GNU_SOURCE + +#include +#include +#include +#include +#include +#include +#include + +#include "test-runner.h" + +extern const struct test __start_test_section, __stop_test_section; + +static void +run_test(void *data) +{ + struct weston_compositor *compositor = data; + const struct test *t; + + for (t = &__start_test_section; t < &__stop_test_section; t++) + t->run(compositor); +} + +int +module_init(struct weston_compositor *compositor); + +WL_EXPORT int +module_init(struct weston_compositor *compositor) +{ + struct wl_event_loop *loop; + + loop = wl_display_get_event_loop(compositor->wl_display); + + wl_event_loop_add_idle(loop, run_test, compositor); + + return 0; +} diff --git a/tests/test-runner.h b/tests/test-runner.h new file mode 100644 index 00000000..33df58f5 --- /dev/null +++ b/tests/test-runner.h @@ -0,0 +1,25 @@ +#ifndef _TEST_RUNNER_H_ +#define _TEST_RUNNER_H_ + +#ifdef NDEBUG +#error "Tests must not be built with NDEBUG defined, they rely on assert()." +#endif + +#include "../src/compositor.h" + +struct test { + const char *name; + void (*run)(struct weston_compositor *compositor); +} __attribute__ ((aligned (16))); + +#define TEST(name) \ + static void name(struct weston_compositor *compositor); \ + \ + const struct test test##name \ + __attribute__ ((section ("test_section"))) = { \ + #name, name \ + }; \ + \ + static void name(struct weston_compositor *compositor) + +#endif diff --git a/tests/weston-test b/tests/weston-test new file mode 100644 index 00000000..23145140 --- /dev/null +++ b/tests/weston-test @@ -0,0 +1,4 @@ +#!/bin/sh + +../src/weston --module=$abs_builddir/.libs/${1/.la/.so} +