system/weston
system/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston synced 2024-07-22 19:24:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tests: add build option to force skips as failures

Browse source 
This will be useful in CI, where we do not want to see any skips. If
something starts to skip, that's a mistake somewhere, and want to catch
it.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
Pekka Paalanen 2021-03-03 14:21:01 +02:00
parent cde58fd20a
commit ee38ed80d8
3 changed files with 31 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
meson_options.txt
View file

@ -210,6 +210,12 @@ option(
value: true,
description: 'Tests: output JUnit XML results'
)
option(
'test-skip-is-failure',
type: 'boolean',
value: false,
description: 'Tests: consider skip to be a failure'
)
option(
'test-gl-renderer',
type: 'boolean',

1
tests/meson.build
View file

@ -276,6 +276,7 @@ test_config_h.set_quoted('WESTON_TEST_REFERENCE_PATH', meson.current_source_dir(
test_config_h.set_quoted('WESTON_MODULE_MAP', env_modmap)
test_config_h.set_quoted('WESTON_DATA_DIR', join_paths(meson.current_source_dir(), '..', 'data'))
test_config_h.set_quoted('TESTSUITE_PLUGIN_PATH', exe_plugin_test.full_path())
test_config_h.set10('WESTON_TEST_SKIP_IS_FAILURE', get_option('test-skip-is-failure'))
configure_file(output: 'test-config.h', configuration: test_config_h)
foreach t : tests

25
tests/weston-test-runner.c
View file

@ -35,6 +35,7 @@
#include <signal.h>
#include <getopt.h>
#include "test-config.h"
#include "weston-test-runner.h"
#include "weston-testsuite-data.h"
#include "shared/string-helpers.h"
@ -243,7 +244,11 @@ result_to_str(enum test_result_code ret)
[RESULT_FAIL] = "fail",
[RESULT_HARD_ERROR] = "hard error",
[RESULT_OK] = "ok",
#if WESTON_TEST_SKIP_IS_FAILURE
[RESULT_SKIP] = "skip error",
#else
[RESULT_SKIP] = "skip",
#endif
};
assert(ret >= 0 && ret < ARRAY_LENGTH(names));
@ -284,6 +289,9 @@ run_case(struct wet_testsuite_data *suite_data,
case RESULT_SKIP:
suite_data->skipped++;
skip = " # SKIP";
#if WESTON_TEST_SKIP_IS_FAILURE
fail = "not ";
#endif
break;
}
@ -327,10 +335,16 @@ skip_case(struct wet_testsuite_data *suite_data,
const void *test_data,
int iteration)
{
const char *skip_error = "";
int iteration_nr = iteration + 1;
#if WESTON_TEST_SKIP_IS_FAILURE
skip_error = "not ";
#endif
suite_data->counter++;
printf("ok %d %s %s/%d # SKIP fixture\n", suite_data->counter,
printf("%sok %d %s %s/%d # SKIP fixture\n",
skip_error, suite_data->counter,
suite_data->fixture_name, t->name, iteration_nr);
}
@ -477,6 +491,11 @@ weston_test_harness_destroy(struct weston_test_harness *harness)
static enum test_result_code
counts_to_result(const struct wet_testsuite_data *data)
{
#if WESTON_TEST_SKIP_IS_FAILURE
if (data->skipped > 0)
return RESULT_FAIL;
#endif
/* RESULT_SKIP is reserved for fixture setup itself skipping everything */
if (data->total == data->passed + data->skipped)
return RESULT_OK;
@ -644,7 +663,11 @@ main(int argc, char *argv[])
if (ret == RESULT_SKIP) {
tap_skip_fixture(&harness->data);
#if WESTON_TEST_SKIP_IS_FAILURE
ret = RESULT_FAIL;
#else
continue;
#endif
}
if (ret != RESULT_OK && result != RESULT_HARD_ERROR)