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

build: Remove compatibility with GTest not having --tap


GLib 2.38 supported this, and we now have GLib 2.58 in scout.

Signed-off-by: default avatarSimon McVittie <smcv@collabora.com>
parent 5a290556
No related branches found
No related tags found
1 merge request!725Remove compatibility with GLib < 2.58
......@@ -288,7 +288,6 @@ glib = dependency('glib-2.0', version : glib_required)
gobject = dependency('gobject-2.0', version : glib_required)
gio = dependency('gio-2.0', version : glib_required)
gio_unix = dependency('gio-unix-2.0', version : glib_required)
glib_tap_support = glib.version().version_compare('>=2.38')
json_glib = dependency(
'json-glib-1.0',
......
......@@ -453,25 +453,15 @@ foreach test_info : tests
]
endif
if glib_tap_support
test(
test_name,
exe,
args : ['--tap'],
depends : test_depends,
env : test_env,
protocol : 'tap',
timeout : timeout,
)
else
test(
test_name,
exe,
depends : test_depends,
env : test_env,
timeout : timeout,
)
endif
test(
test_name,
exe,
args : ['--tap'],
depends : test_depends,
env : test_env,
protocol : 'tap',
timeout : timeout,
)
endforeach
lint_scripts = [
......
......@@ -101,25 +101,14 @@ foreach test_info : compiled_tests
include_directories : pv_include_dirs,
install : false,
)
if glib_tap_support
test(
test_name, exe,
args : ['--tap'],
depends : test_depends,
env : test_env,
protocol : 'tap',
suite : ['pressure-vessel'],
)
else
test(
test_name, exe,
depends : test_depends,
env : test_env,
suite : ['pressure-vessel'],
)
endif
test(
test_name, exe,
args : ['--tap'],
depends : test_depends,
env : test_env,
protocol : 'tap',
suite : ['pressure-vessel'],
)
endforeach
foreach test_name : tests
......
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