mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-25 17:50:36 +00:00
tests: use GST_*_1_0 environment variables everywhere
The _1_0 suffixed environment variables override the non-suffixed ones, so if we're in an environment that sets the _1_0 suffixed ones, such as jhbuild, we need to set those to make sure ours actually always get used.
This commit is contained in:
parent
7cb268bf9f
commit
114442bdb8
1 changed files with 3 additions and 3 deletions
|
@ -4,14 +4,14 @@ CHECK_REGISTRY = $(top_builddir)/tests/check/test-registry.reg
|
||||||
TEST_FILES_DIRECTORY = $(top_srcdir)/tests/files
|
TEST_FILES_DIRECTORY = $(top_srcdir)/tests/files
|
||||||
|
|
||||||
REGISTRY_ENVIRONMENT = \
|
REGISTRY_ENVIRONMENT = \
|
||||||
GST_REGISTRY=$(CHECK_REGISTRY)
|
GST_REGISTRY_1_0=$(CHECK_REGISTRY)
|
||||||
|
|
||||||
TESTS_ENVIRONMENT = \
|
TESTS_ENVIRONMENT = \
|
||||||
CK_DEFAULT_TIMEOUT=120 \
|
CK_DEFAULT_TIMEOUT=120 \
|
||||||
GST_STATE_IGNORE_ELEMENTS="$(STATE_IGNORE_ELEMENTS)" \
|
GST_STATE_IGNORE_ELEMENTS="$(STATE_IGNORE_ELEMENTS)" \
|
||||||
$(REGISTRY_ENVIRONMENT) \
|
$(REGISTRY_ENVIRONMENT) \
|
||||||
GST_PLUGIN_SYSTEM_PATH= \
|
GST_PLUGIN_SYSTEM_PATH_1_0= \
|
||||||
GST_PLUGIN_PATH=$(GST_PLUGINS_DIR):$(GSTPB_PLUGINS_DIR):$(GSTPG_PLUGINS_DIR) \
|
GST_PLUGIN_PATH_1_0=$(GST_PLUGINS_DIR):$(GSTPB_PLUGINS_DIR):$(GSTPG_PLUGINS_DIR) \
|
||||||
GST_PLUGIN_LOADING_WHITELIST="gstreamer:gst-plugins-base:gst-plugins-good"
|
GST_PLUGIN_LOADING_WHITELIST="gstreamer:gst-plugins-base:gst-plugins-good"
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue