From be61a1ff502108eb5b1aca1c689b67f1afe03d6e Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Thu, 14 Mar 2019 16:56:27 +0200 Subject: [PATCH] tests: fix references to automake 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 --- tests/ivi-layout-test-plugin.c | 4 ++-- tests/weston-test-client-helper.c | 2 +- tests/weston-test.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/ivi-layout-test-plugin.c b/tests/ivi-layout-test-plugin.c index aa88a712..fa769535 100644 --- a/tests/ivi-layout-test-plugin.c +++ b/tests/ivi-layout-test-plugin.c @@ -181,7 +181,7 @@ test_client_sigchld(struct weston_process *process, int status) container_of(process, struct test_launcher, process); 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. */ if (WIFEXITED(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 * 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. * * Once Weston init completes, this module launches one test program: diff --git a/tests/weston-test-client-helper.c b/tests/weston-test-client-helper.c index ea202c0c..27e6b86a 100644 --- a/tests/weston-test-client-helper.c +++ b/tests/weston-test-client-helper.c @@ -850,7 +850,7 @@ skip(const char *fmt, ...) /* automake tests uses exit code 77. weston-test-runner will see * 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 - * automake will see in the end. */ + * ninja will see in the end. */ exit(77); } diff --git a/tests/weston-test.c b/tests/weston-test.c index 12ef54ee..c018cee5 100644 --- a/tests/weston-test.c +++ b/tests/weston-test.c @@ -64,7 +64,7 @@ test_client_sigchld(struct weston_process *process, int status) struct weston_test *test = 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. */ if (WIFEXITED(status) && WEXITSTATUS(status) != 0) exit(WEXITSTATUS(status));