Skip to content

QOL changes for test runner #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ if tests
# redirecting to a file. We can detect this if stdout is an terminal, and
# disable TAP protocol.
pytest = find_program('pytest')
script = '''export DBUS_STARTER_BUS_TYPE=user; if [ ! -t 1 ]; then PYTEST_FLAGS="--tap"; fi; @0@ $PYTEST_FLAGS'''.format(pytest.full_path())
script = '''export DBUS_STARTER_BUS_TYPE=user; if [ ! -t 1 ]; then PYTEST_FLAGS="--tap"; fi; @0@ $PYTEST_FLAGS $@'''.format(pytest.full_path())
sh = find_program('sh')
dbus_run_session = find_program('dbus-run-session')

Expand All @@ -140,7 +140,7 @@ if tests

test('test-mctpd', dbus_run_session,
depends: mctpd_test,
args: [ sh.full_path(), '-c', script ],
args: [ sh.full_path(), '-c', script, '--' ],
protocol: 'tap',
)
endif