diff options
| author | U. Artie Eoff <ullysses.a.eoff@intel.com> | 2021-09-14 20:57:30 -0700 |
|---|---|---|
| committer | U. Artie Eoff <ullysses.a.eoff@intel.com> | 2021-09-14 23:15:44 -0700 |
| commit | 8b1634930fec18b37332e2bc858328eaf4c186ca (patch) | |
| tree | c29830bae7c0d03a5de32768a9b88f130fceed6c | |
| parent | 5dc39091f393a8cc596871015e6b2c3dd1d18004 (diff) | |
| download | gstreamer-plugins-bad-8b1634930fec18b37332e2bc858328eaf4c186ca.tar.gz | |
tests: skip aes test if elements not built
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>
| -rw-r--r-- | ext/aes/meson.build | 5 | ||||
| -rw-r--r-- | tests/check/meson.build | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/ext/aes/meson.build b/ext/aes/meson.build index c83049234..a200b8d7d 100644 --- a/ext/aes/meson.build +++ b/ext/aes/meson.build @@ -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() diff --git a/tests/check/meson.build b/tests/check/meson.build index 713b99933..195761b55 100644 --- a/tests/check/meson.build +++ b/tests/check/meson.build @@ -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']], |