Skip to content

meson: Clean up python module check #9

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: telepathy-idle-0.2
Choose a base branch
from
Open

meson: Clean up python module check #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8e0ffe
meson: Increase twisted tests timeout
jtojnar Nov 2, 2020
47b5b1d
meson: Clean up python module check
jtojnar Nov 2, 2020
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
20 changes: 13 additions & 7 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@ project(
default_options: [
'c_std=c99',
],
meson_version: '>= 0.50.0',
meson_version: '>= 0.51.0',
)

package_string = '@0@-@1@'.format(meson.project_name(), meson.project_version())

py_mod = import('python')
cc = meson.get_compiler('c')

glib = dependency('glib-2.0', version: '>= 2.32.0')
Expand All @@ -38,15 +39,20 @@ idle_deps = [
]

xsltproc = find_program('xsltproc')
python = import('python').find_installation('python3')
# For generating GInterface
python = py_mod.find_installation('python3')

# check for a version of python that can run the twisted tests
if get_option('twisted_tests')
if run_command(python, '-c', '''from sys import version_info; import dbus, dbus.mainloop.glib; raise SystemExit(version_info < (2, 5, 0, 'final', 0))''').returncode() != 0 or run_command(python, '-c', '''import twisted.words.protocols.irc, twisted.internet.reactor''').returncode() != 0
error('Missing twisted IRC support')
endif

test_python = python.path()
test_python = py_mod.find_installation(
'python3',
modules: [
'dbus',
'dbus.mainloop.glib',
'twisted.words.protocols.irc',
'twisted.internet.reactor',
],
).path()
endif

# Directories
Expand Down
1 change: 1 addition & 0 deletions tests/twisted/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ test(
test_list,
],
suite: 'twisted',
timeout: 2 * 60,
)

subdir('tools')