Skip to content

Commit 04e13ba

Browse files
committed
meson: simplify test script
Shorten the PYTEST_FLAGS var name to keep the one-line script a little more manageable, no need for an export, and re-wrap. Signed-off-by: Jeremy Kerr <[email protected]>
1 parent 988055d commit 04e13ba

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

meson.build

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,9 @@ if tests
141141
# redirecting to a file. We can detect this if stdout is an terminal, and
142142
# disable TAP protocol.
143143
pytest = find_program('pytest')
144-
script = '''export DBUS_STARTER_BUS_TYPE=user; if [ ! -t 1 ]; then PYTEST_FLAGS="--tap"; fi; @0@ $PYTEST_FLAGS $@'''.format(pytest.full_path())
144+
script = 'if [ ! -t 1 ]; then PFL="--tap"; fi; DBUS_STARTER_BUS_TYPE=user "@0@" $PFL $@'.format(
145+
pytest.full_path()
146+
)
145147
sh = find_program('sh')
146148
dbus_run_session = find_program('dbus-run-session')
147149

0 commit comments

Comments
 (0)