mirror of
https://gitlab.freedesktop.org/wayland/weston
synced 2024-07-22 19:24:27 +00:00
080d85b8fb
It turns out that if the client is not explicitly destroyed, it will remain connected until the compositor shuts down because there is no more a client process that would terminate. Usually this is not a problem, but if a test file has multiple screenshooting tests, the windows from earlier tests in the file will remain on screen. That is not wanted, hence implement client destruction. To properly destroy a client, we also need a list of outputs. They used to be simply leaked. This does not fix wl_registry.global_remove for wl_outputs, that is left for a time when a test will actually need that. This patch makes only ivi-shell-app test use the new client_destroy() to show that it actually works. The added log scopes prove it: destroy requests get sent. Sprinkling client_destroy() around in all other tests is left for a time when it is actually necessary. ivi-shell-app is a nicely simple test doing little else, hence I picked it. Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
91 lines
2.6 KiB
C
91 lines
2.6 KiB
C
/*
|
|
* Copyright © 2015 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 <stdio.h>
|
|
#include <string.h>
|
|
|
|
#include "weston-test-client-helper.h"
|
|
#include "ivi-application-client-protocol.h"
|
|
#include "weston-test-fixture-compositor.h"
|
|
#include "test-config.h"
|
|
|
|
static enum test_result_code
|
|
fixture_setup(struct weston_test_harness *harness)
|
|
{
|
|
struct compositor_setup setup;
|
|
|
|
compositor_setup_defaults(&setup);
|
|
setup.shell = SHELL_IVI;
|
|
setup.config_file = TESTSUITE_IVI_CONFIG_PATH;
|
|
setup.logging_scopes = "log,test-harness-plugin,proto";
|
|
|
|
return weston_test_harness_execute_as_client(harness, &setup);
|
|
}
|
|
DECLARE_FIXTURE_SETUP(fixture_setup);
|
|
|
|
static struct ivi_application *
|
|
get_ivi_application(struct client *client)
|
|
{
|
|
struct global *g;
|
|
struct global *global_iviapp = NULL;
|
|
struct ivi_application *iviapp;
|
|
|
|
wl_list_for_each(g, &client->global_list, link) {
|
|
if (strcmp(g->interface, "ivi_application"))
|
|
continue;
|
|
|
|
if (global_iviapp)
|
|
assert(0 && "multiple ivi_application objects");
|
|
|
|
global_iviapp = g;
|
|
}
|
|
|
|
assert(global_iviapp && "no ivi_application found");
|
|
|
|
assert(global_iviapp->version == 1);
|
|
|
|
iviapp = wl_registry_bind(client->wl_registry, global_iviapp->name,
|
|
&ivi_application_interface, 1);
|
|
assert(iviapp);
|
|
|
|
return iviapp;
|
|
}
|
|
|
|
TEST(ivi_application_exists)
|
|
{
|
|
struct client *client;
|
|
struct ivi_application *iviapp;
|
|
|
|
client = create_client();
|
|
iviapp = get_ivi_application(client);
|
|
client_roundtrip(client);
|
|
|
|
testlog("Successful bind: %p\n", iviapp);
|
|
|
|
client_destroy(client);
|
|
}
|