mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 16:50:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

tests: skip aes test if elements not built

Browse source 
In ext/aes/meson.build, the aes_dep will return
not-found if -Daes=disabled, regardless of whether
openssl is found or not.  Thus, we don't need a
separate check for the option.  This will also
ensure that aes_dep is always defined and we can
use it in the tests/check/meson.build unit.

Fixes #1660

v2: handle -Daes=disabled, too.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/2522>
This commit is contained in:
U. Artie Eoff 2021-09-14 20:57:30 -07:00
parent 5dc39091f3
commit 8b1634930f
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ext/aes/meson.build
View file

@ -5,11 +5,6 @@ aes_sources = [
'gstaesdec.c',
]
aes_option = get_option('aes')
if aes_option.disabled()
subdir_done()
endif
aes_cargs = []
aes_dep = dependency('openssl', required : get_option('aes'))
if aes_dep.found()

5
tests/check/meson.build
View file

@ -18,12 +18,11 @@ nalutils_dep = gstcodecparsers_dep.partial_dependency (compile_args: true, inclu
enable_gst_play_tests = get_option('gst_play_tests')
libsoup_dep = dependency('libsoup-2.4', version : '>=2.48', required : enable_gst_play_tests,
fallback : ['libsoup', 'libsoup_dep'])
aes_dep = dependency('openssl', required : false)
# name, condition when to skip the test and extra dependencies
base_tests = [
[['elements/aesenc.c'], false, [aes_dep]],
[['elements/aesdec.c'], false, [aes_dep]],
[['elements/aesenc.c'], not aes_dep.found(), [aes_dep]],
[['elements/aesdec.c'], not aes_dep.found(), [aes_dep]],
[['elements/aiffparse.c']],
[['elements/asfmux.c']],
[['elements/autoconvert.c']],