diff options
| -rwxr-xr-x | run_project_tests.py | 2 | ||||
| -rw-r--r-- | test cases/common/121 skip/meson.build | 4 | ||||
| -rw-r--r-- | test cases/frameworks/10 gtk-doc/meson.build | 4 | ||||
| -rw-r--r-- | test cases/python3/3 cython/meson.build | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/run_project_tests.py b/run_project_tests.py index 2bc7660..15d656b 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -401,7 +401,7 @@ def run_tests(extra_args): futures.append((testname, t, result)) for (testname, t, result) in futures: result = result.result() - if result is None: + if result is None or 'MESON_SKIP_TEST' in result.stdo: print('Skipping:', t) current_test = ET.SubElement(current_suite, 'testcase', {'name' : testname, 'classname' : name}) diff --git a/test cases/common/121 skip/meson.build b/test cases/common/121 skip/meson.build new file mode 100644 index 0000000..1adedb6 --- /dev/null +++ b/test cases/common/121 skip/meson.build @@ -0,0 +1,4 @@ +project('skip', 'c') + +error('MESON_SKIP_TEST this test is always skipped.') + diff --git a/test cases/frameworks/10 gtk-doc/meson.build b/test cases/frameworks/10 gtk-doc/meson.build index c6881ab..95eeefa 100644 --- a/test cases/frameworks/10 gtk-doc/meson.build +++ b/test cases/frameworks/10 gtk-doc/meson.build @@ -8,4 +8,6 @@ inc = include_directories('include') # We have to disable this test until this bug fix has landed to # distros https://bugzilla.gnome.org/show_bug.cgi?id=753145 -# subdir('doc') +error('MESON_SKIP_TEST can not enable gtk-doc test until upstream fixes have landed.') + +subdir('doc') diff --git a/test cases/python3/3 cython/meson.build b/test cases/python3/3 cython/meson.build index cd245c7..8729640 100644 --- a/test cases/python3/3 cython/meson.build +++ b/test cases/python3/3 cython/meson.build @@ -13,5 +13,5 @@ if cython.found() env : ['PYTHONPATH=' + pydir] ) else - message('Cython not found, skipping test.') + error('MESON_SKIP_TEST: Cython not found, skipping test.') endif |