From 61a6b03d6fafb7d33a05c7af5fb7500da196ec64 Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Fri, 25 Oct 2019 13:57:10 +0300 Subject: [PATCH] compositor: add test suite data Allow to set and get one opaque pointer. The test suite will then use this to pass data from the test runner to the test plugin, so that the plugin can then run what it needs to. This is useful when the test runner calls wet_main() directly instead of forking a compositor. Signed-off-by: Pekka Paalanen --- compositor/meson.build | 1 + compositor/testsuite-util.c | 62 +++++++++++++++++++++++++++++++++++++++++++++ compositor/weston.h | 12 +++++++++ 3 files changed, 75 insertions(+) create mode 100644 compositor/testsuite-util.c diff --git a/compositor/meson.build b/compositor/meson.build index e1334d6..f17415b 100644 --- a/compositor/meson.build +++ b/compositor/meson.build @@ -1,6 +1,7 @@ srcs_weston = [ git_version_h, 'main.c', + 'testsuite-util.c', 'text-backend.c', 'weston-screenshooter.c', text_input_unstable_v1_server_protocol_h, diff --git a/compositor/testsuite-util.c b/compositor/testsuite-util.c new file mode 100644 index 0000000..34882d1 --- /dev/null +++ b/compositor/testsuite-util.c @@ -0,0 +1,62 @@ +/* + * Copyright 2019 Collabora, Ltd. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial + * portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#include "config.h" + +#include +#include "weston.h" + +static struct wet_testsuite_data *wet_testsuite_data_global; + +/** Set global test suite data + * + * \param data Custom test suite data. + * + * The type struct wet_testsuite_data is free to be defined by any test suite + * in any way they want. This function stores a single pointer to that data + * in a global variable. + * + * The data is expected to be fetched from a test suite specific plugin that + * knows how to interpret it. + * + * \sa wet_testsuite_data_get + */ +WL_EXPORT void +wet_testsuite_data_set(struct wet_testsuite_data *data) +{ + wet_testsuite_data_global = data; +} + +/** Get global test suite data + * + * \return Custom test suite data. + * + * Returns the value last set with wet_testsuite_data_set(). + */ +WL_EXPORT struct wet_testsuite_data * +wet_testsuite_data_get(void) +{ + return wet_testsuite_data_global; +} diff --git a/compositor/weston.h b/compositor/weston.h index 24a6737..e09397f 100644 --- a/compositor/weston.h +++ b/compositor/weston.h @@ -98,6 +98,18 @@ text_backend_destroy(struct text_backend *text_backend); int wet_main(int argc, char *argv[]); + +/* test suite utilities */ + +/** Opaque type for a test suite to define. */ +struct wet_testsuite_data; + +void +wet_testsuite_data_set(struct wet_testsuite_data *data); + +struct wet_testsuite_data * +wet_testsuite_data_get(void); + #ifdef __cplusplus } #endif -- 2.7.4