tests: add mechanism to change Weston's behavior when running certain tests
There are some specific cases in which we need Weston to behave differently when running in the test suite. This adds a new API to allow the tests to select these behaviors. For instance, in the DRM backend we plan to add a writeback connector screenshooter. In case it fails for some reason, it should fallback to the renderer screenshooter that all other backends use. But if we add a test to ensure the correctness of the writeback screenshooter, we don't want it to fallback to the renderer one, we want it to fail. With this new API we can choose to disable the fallback behavior specifically for this test. Signed-off-by: Leandro Ribeiro <leandro.ribeiro@collabora.com>
This commit is contained in:
committed by
Pekka Paalanen
parent
526765ddfd
commit
32a5acde5b
@@ -30,5 +30,5 @@
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
return wet_main(argc, argv);
|
||||
return wet_main(argc, argv, NULL);
|
||||
}
|
||||
|
||||
+4
-1
@@ -3119,7 +3119,7 @@ weston_log_subscribe_to_scopes(struct weston_log_context *log_ctx,
|
||||
}
|
||||
|
||||
WL_EXPORT int
|
||||
wet_main(int argc, char *argv[])
|
||||
wet_main(int argc, char *argv[], const struct weston_testsuite_data *test_data)
|
||||
{
|
||||
int ret = EXIT_FAILURE;
|
||||
char *cmdline;
|
||||
@@ -3289,6 +3289,9 @@ wet_main(int argc, char *argv[])
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (test_data)
|
||||
weston_compositor_test_data_init(wet.compositor, test_data);
|
||||
|
||||
protocol_scope =
|
||||
weston_log_ctx_add_log_scope(log_ctx, "proto",
|
||||
"Wayland protocol dump for all clients.\n",
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
srcs_weston = [
|
||||
git_version_h,
|
||||
'main.c',
|
||||
'testsuite-util.c',
|
||||
'text-backend.c',
|
||||
'weston-screenshooter.c',
|
||||
text_input_unstable_v1_server_protocol_h,
|
||||
|
||||
@@ -1,62 +0,0 @@
|
||||
/*
|
||||
* 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 <wayland-util.h>
|
||||
#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;
|
||||
}
|
||||
+1
-7
@@ -96,7 +96,7 @@ void
|
||||
text_backend_destroy(struct text_backend *text_backend);
|
||||
|
||||
int
|
||||
wet_main(int argc, char *argv[]);
|
||||
wet_main(int argc, char *argv[], const struct weston_testsuite_data *test_data);
|
||||
|
||||
|
||||
/* test suite utilities */
|
||||
@@ -104,12 +104,6 @@ wet_main(int argc, char *argv[]);
|
||||
/** 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
|
||||
|
||||
Reference in New Issue
Block a user