system/weston
system/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston synced 2024-09-16 08:46:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: fix references to automake

Browse source 
There is no automake anymore, I suppose it is ninja that handles it now.

There are still a couple references to automake left to point out where the
conventions originated, e.g. the exit code 77.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
Pekka Paalanen 2019-03-14 16:56:27 +02:00
parent 5dc2ddf9c6
commit be61a1ff50
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/ivi-layout-test-plugin.c
View file

@ -181,7 +181,7 @@ test_client_sigchld(struct weston_process *process, int status)
container_of(process, struct test_launcher, process); container_of(process, struct test_launcher, process);
struct weston_compositor *c = launcher->compositor; struct weston_compositor *c = launcher->compositor;
/* Chain up from weston-test-runner's exit code so that automake /* Chain up from weston-test-runner's exit code so that ninja
* knows the exit status and can report e.g. skipped tests. */ * knows the exit status and can report e.g. skipped tests. */
if (WIFEXITED(status)) if (WIFEXITED(status))
weston_compositor_exit_with_code(c, WEXITSTATUS(status)); weston_compositor_exit_with_code(c, WEXITSTATUS(status));
@ -297,7 +297,7 @@ runner_assert_fail(const char *cond, const char *file, int line,
* This module is specially written to execute tests that target the * This module is specially written to execute tests that target the
* ivi_layout API. * ivi_layout API.
* *
* This module is listed in TESTS in Makefile.am. weston-tests-env handles * This module is listed in meson.build which handles
* this module specially by loading it in ivi-shell. * this module specially by loading it in ivi-shell.
* *
* Once Weston init completes, this module launches one test program: * Once Weston init completes, this module launches one test program:

2
tests/weston-test-client-helper.c
View file

@ -850,7 +850,7 @@ skip(const char *fmt, ...)
/* automake tests uses exit code 77. weston-test-runner will see /* automake tests uses exit code 77. weston-test-runner will see
* this and use it, and then weston-test's sigchld handler (in the * this and use it, and then weston-test's sigchld handler (in the
* weston process) will use that as an exit status, which is what * weston process) will use that as an exit status, which is what
* automake will see in the end. */ * ninja will see in the end. */
exit(77); exit(77);
} }

2
tests/weston-test.c
View file

@ -64,7 +64,7 @@ test_client_sigchld(struct weston_process *process, int status)
struct weston_test *test = struct weston_test *test =
container_of(process, struct weston_test, process); container_of(process, struct weston_test, process);
/* Chain up from weston-test-runner's exit code so that automake /* Chain up from weston-test-runner's exit code so that ninja
* knows the exit status and can report e.g. skipped tests. */ * knows the exit status and can report e.g. skipped tests. */
if (WIFEXITED(status) && WEXITSTATUS(status) != 0) if (WIFEXITED(status) && WEXITSTATUS(status) != 0)
exit(WEXITSTATUS(status)); exit(WEXITSTATUS(status));