diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2021-09-11 15:54:34 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-11 15:54:34 -0300 |
commit | 16e0d07d36787d14e9d00ff8123419863d1f19d2 (patch) | |
tree | 36a413f5702cd2d29b5023ec0762b71c27e4fac3 /recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-use-a-dictionaries-for-environment.patch | |
parent | 25e9cbddbd32802634bafef62ba08da9821c604d (diff) | |
parent | b821d72e7b7fc250eb80fa43a79ce31b88863239 (diff) | |
download | meta-freescale-16e0d07d36787d14e9d00ff8123419863d1f19d2.tar.gz |
Merge pull request #859 from angolini/hardknott+bsp
Backport NXP BSP 5.10.35_2.0.0 to Hardknott
Diffstat (limited to 'recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-use-a-dictionaries-for-environment.patch')
-rw-r--r-- | recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-use-a-dictionaries-for-environment.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-use-a-dictionaries-for-environment.patch b/recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-use-a-dictionaries-for-environment.patch new file mode 100644 index 00000000..46813cec --- /dev/null +++ b/recipes-multimedia/gstreamer/gstreamer1.0/0006-tests-use-a-dictionaries-for-environment.patch | |||
@@ -0,0 +1,48 @@ | |||
1 | From e82dedec1803922656e92285fc1bb75b2cdc0aad Mon Sep 17 00:00:00 2001 | ||
2 | From: Jose Quaresma <quaresma.jose@gmail.com> | ||
3 | Date: Sat, 24 Apr 2021 10:34:47 +0100 | ||
4 | Subject: [PATCH 3/4] tests: use a dictionaries for environment | ||
5 | |||
6 | meson environment() can't be passed to configure_file and it is needed for installed_tests, | ||
7 | use a dictionary as this is simplest solution to install the environment. | ||
8 | |||
9 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/789] | ||
10 | |||
11 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | ||
12 | --- | ||
13 | tests/check/meson.build | 19 +++++++++++-------- | ||
14 | 1 file changed, 11 insertions(+), 8 deletions(-) | ||
15 | |||
16 | diff --git a/tests/check/meson.build b/tests/check/meson.build | ||
17 | index a697a7b06..f64524904 100644 | ||
18 | --- a/tests/check/meson.build | ||
19 | +++ b/tests/check/meson.build | ||
20 | @@ -161,14 +161,17 @@ foreach t : core_tests | ||
21 | install: installed_tests_enabled, | ||
22 | ) | ||
23 | |||
24 | - env = environment() | ||
25 | - env.set('GST_PLUGIN_PATH_1_0', meson.build_root()) | ||
26 | - env.set('GST_PLUGIN_SYSTEM_PATH_1_0', '') | ||
27 | - env.set('GST_STATE_IGNORE_ELEMENTS', '') | ||
28 | - env.set('CK_DEFAULT_TIMEOUT', '20') | ||
29 | - env.set('GST_REGISTRY', '@0@/@1@.registry'.format(meson.current_build_dir(), test_name)) | ||
30 | - env.set('GST_PLUGIN_SCANNER_1_0', gst_scanner_dir + '/gst-plugin-scanner') | ||
31 | - env.set('GST_PLUGIN_LOADING_WHITELIST', 'gstreamer') | ||
32 | + # environment() can't be passed to configure_file and it is needed for installed_tests | ||
33 | + # use a dictionary as this is simplest solution to install the environment | ||
34 | + env = { | ||
35 | + 'GST_PLUGIN_PATH_1_0': meson.build_root(), | ||
36 | + 'GST_PLUGIN_SYSTEM_PATH_1_0': '', | ||
37 | + 'GST_STATE_IGNORE_ELEMENTS': '', | ||
38 | + 'CK_DEFAULT_TIMEOUT': '20', | ||
39 | + 'GST_REGISTRY': '@0@/@1@.registry'.format(meson.current_build_dir(), test_name), | ||
40 | + 'GST_PLUGIN_SCANNER_1_0': gst_scanner_dir + '/gst-plugin-scanner', | ||
41 | + 'GST_PLUGIN_LOADING_WHITELIST': 'gstreamer', | ||
42 | + } | ||
43 | |||
44 | if installed_tests_enabled | ||
45 | test_conf = configuration_data() | ||
46 | -- | ||
47 | 2.31.1 | ||
48 | |||