Skip to content
Snippets Groups Projects
Commit 5cac8c2e authored by Simon McVittie's avatar Simon McVittie
Browse files

Revert "tests: Work around a Meson 0.63 regression"


Meson 0.63.1 has been released and fixes this regression.
This reverts commit a6ce46cb.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent fdc94b9b
No related branches found
No related tags found
No related merge requests found
......@@ -7,7 +7,6 @@ steam-runtime-tools (0.20220803.1) UNRELEASED; urgency=medium
(steamrt/tasks#149)
* pressure-vessel: Avoid startup failure with --filesystem=/overrides
* build: Require Meson 0.56.2 backport, update build system accordingly
* tests: Work around a Meson 0.63 regression
-- Simon McVittie <smcv@collabora.com> Thu, 11 Aug 2022 20:10:59 +0100
......
......@@ -29,13 +29,6 @@ test_env.prepend('PATH', join_paths(meson.current_build_dir(), '..', 'bin'))
no_activation_session_conf = files('session.conf')
if meson.version().version_compare('>=0.63')
# Work around https://github.com/mesonbuild/meson/issues/10577
tap_test_protocol = 'exitcode'
else
tap_test_protocol = 'tap'
endif
tests = [
{'name': 'architecture'},
{'name': 'container'},
......@@ -203,7 +196,7 @@ foreach test_info : tests
exe,
args : ['--tap'],
env : test_env,
protocol : tap_test_protocol,
protocol : 'tap',
timeout : timeout,
)
else
......@@ -446,7 +439,7 @@ foreach test_name : lint_scripts
test_name, files(test_name),
env : test_env,
suite : 'lint',
protocol : tap_test_protocol,
protocol : 'tap',
timeout : timeout,
)
endforeach
......
......@@ -78,7 +78,7 @@ foreach test_name : compiled_tests
test_name, exe,
args : ['--tap'],
env : test_env,
protocol : tap_test_protocol,
protocol : 'tap',
suite : ['pressure-vessel'],
)
else
......@@ -117,7 +117,7 @@ foreach test_name : tests
'--',
] + test_argv,
env : test_env,
protocol : tap_test_protocol,
protocol : 'tap',
suite : ['pressure-vessel'],
timeout : timeout,
)
......@@ -133,7 +133,7 @@ foreach test_name : tests
files(test_name),
],
env : test_env,
protocol : tap_test_protocol,
protocol : 'tap',
suite : ['pressure-vessel'],
timeout : timeout,
)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment