diff options
author | Eli Schwartz <eschwartz@archlinux.org> | 2023-08-17 20:44:42 -0400 |
---|---|---|
committer | Eli Schwartz <eschwartz@archlinux.org> | 2023-08-17 21:30:32 -0400 |
commit | 1fd70a2a004900b7d97d9fc560e87d33266ecfed (patch) | |
tree | 6d4f762d8ed93370f0a228ec56db55f3e9b235ef /unittests | |
parent | 98232eb0364238958996a192d2452ea3b4f8879b (diff) | |
download | meson-1fd70a2a004900b7d97d9fc560e87d33266ecfed.zip meson-1fd70a2a004900b7d97d9fc560e87d33266ecfed.tar.gz meson-1fd70a2a004900b7d97d9fc560e87d33266ecfed.tar.bz2 |
tests: consolidate MESON_SKIP_TEST reporting and use it in unittests
Previously, we only reported the skip reason when running project tests.
Diffstat (limited to 'unittests')
-rw-r--r-- | unittests/baseplatformtests.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/unittests/baseplatformtests.py b/unittests/baseplatformtests.py index 3008eb7..03ab1c5 100644 --- a/unittests/baseplatformtests.py +++ b/unittests/baseplatformtests.py @@ -41,7 +41,7 @@ import mesonbuild.modules.pkgconfig from run_tests import ( Backend, ensure_backend_detects_changes, get_backend_commands, get_builddir_target_args, get_meson_script, run_configure_inprocess, - run_mtest_inprocess + run_mtest_inprocess, handle_meson_skip_test, ) @@ -183,8 +183,9 @@ class BasePlatformTests(TestCase): print('stderr:') print(proc.stderr) if proc.returncode != 0: - if 'MESON_SKIP_TEST' in proc.stdout: - raise SkipTest('Project requested skipping.') + skipped, reason = handle_meson_skip_test(proc.stdout) + if skipped: + raise SkipTest(f'Project requested skipping: {reason}') raise subprocess.CalledProcessError(proc.returncode, command, output=proc.stdout) return proc.stdout @@ -234,8 +235,9 @@ class BasePlatformTests(TestCase): mesonbuild.mlog._logger.log_dir = None mesonbuild.mlog._logger.log_file = None - if 'MESON_SKIP_TEST' in out: - raise SkipTest('Project requested skipping.') + skipped, reason = handle_meson_skip_test(out) + if skipped: + raise SkipTest(f'Project requested skipping: {reason}') if returncode != 0: self._print_meson_log() print('Stdout:\n') @@ -247,8 +249,6 @@ class BasePlatformTests(TestCase): else: try: out = self._run(self.setup_command + args + extra_args + build_and_src_dir_args, override_envvars=override_envvars, workdir=workdir) - except SkipTest: - raise SkipTest('Project requested skipping: ' + srcdir) except Exception: if not allow_fail: self._print_meson_log() |