mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-03 13:16:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

Meson: find_program() will return gst-tester from subproject

Browse source 
gstreamer now use override_find_program() so it won't return the system
version.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/776>
This commit is contained in:
Xavier Claessens 2020-08-04 07:11:54 -04:00
parent 8c94e746f5
commit 0d246fb8b0
1 changed files with 3 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
tests/validate/meson.build
View file

@ -1,22 +1,6 @@
if gst_dep.type_name() == 'internal'
if meson.version().version_compare('>= 0.51')
gst_tester = gst_proj.get_variable('gst_tester', disabler())
if is_disabler(gst_tester)
if get_option('tests').enabled()
error('Tests are enabled for gst-plugins-base but were not enabled for the gstreamer subproject')
endif
subdir_done()
endif
else
# Workaround for meson < 0.51. Remove once we bump the requirement.
# If you hit this, disable tests in gst-plugins-base.
gst_tester = gst_proj.get_variable('gst_tester')
endif
else
gst_tester = find_program('gst-tester-@0@'.format(api_version), required: get_option('tests'))
if not gst_tester.found()
subdir_done()
endif
gst_tester = find_program('gst-tester-@0@'.format(api_version), required: get_option('tests'))
if not gst_tester.found()
subdir_done()
endif
tests = [