mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-25 01:30:38 +00:00
tests: use _1_0 variants for the various registry variables
These override the variants without version suffix. Makes 'make check' work properly in environments that set the suffixed variant for 1.0, such as jhbuild.
This commit is contained in:
parent
c20d13d8f8
commit
e358ec6ddd
1 changed files with 3 additions and 3 deletions
|
@ -6,13 +6,13 @@ TEST_FILES_DIRECTORY = $(top_srcdir)/tests/files
|
||||||
GST_TOOLS_DIR = $(top_builddir)/tools
|
GST_TOOLS_DIR = $(top_builddir)/tools
|
||||||
|
|
||||||
REGISTRY_ENVIRONMENT = \
|
REGISTRY_ENVIRONMENT = \
|
||||||
GST_REGISTRY=$(CHECK_REGISTRY)
|
GST_REGISTRY_1_0=$(CHECK_REGISTRY)
|
||||||
|
|
||||||
# GST_PLUGINS_XYZ_DIR is only set in an uninstalled setup
|
# GST_PLUGINS_XYZ_DIR is only set in an uninstalled setup
|
||||||
TESTS_ENVIRONMENT = \
|
TESTS_ENVIRONMENT = \
|
||||||
$(REGISTRY_ENVIRONMENT) \
|
$(REGISTRY_ENVIRONMENT) \
|
||||||
GST_PLUGIN_SYSTEM_PATH= \
|
GST_PLUGIN_SYSTEM_PATH_1_0= \
|
||||||
GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/sys:$(top_builddir)/ext:$(GST_PLUGINS_FFMPEG_DIR):$(GST_PLUGINS_UGLY_DIR):$(GST_PLUGINS_GOOD_DIR):$(GST_PLUGINS_BASE_DIR):$(GST_PLUGINS_DIR) \
|
GST_PLUGIN_PATH_1_0=$(top_builddir)/gst:$(top_builddir)/sys:$(top_builddir)/ext:$(GST_PLUGINS_FFMPEG_DIR):$(GST_PLUGINS_UGLY_DIR):$(GST_PLUGINS_GOOD_DIR):$(GST_PLUGINS_BASE_DIR):$(GST_PLUGINS_DIR) \
|
||||||
GST_PLUGIN_LOADING_WHITELIST="gstreamer@$(GST_PLUGINS_DIR):gst-plugins-base@$(GSTPB_PLUGINS_DIR):gst-plugins-good:gst-plugins-ugly:gst-ffmpeg:gst-plugins-bad@$(top_builddir)" \
|
GST_PLUGIN_LOADING_WHITELIST="gstreamer@$(GST_PLUGINS_DIR):gst-plugins-base@$(GSTPB_PLUGINS_DIR):gst-plugins-good:gst-plugins-ugly:gst-ffmpeg:gst-plugins-bad@$(top_builddir)" \
|
||||||
GST_STATE_IGNORE_ELEMENTS="apexsink camerabin cdaudio dc1394src \
|
GST_STATE_IGNORE_ELEMENTS="apexsink camerabin cdaudio dc1394src \
|
||||||
dccpclientsrc dccpclientsink dccpserversrc dccpserversink decklinksrc \
|
dccpclientsrc dccpclientsink dccpserversrc dccpserversink decklinksrc \
|
||||||
|
|
Loading…
Reference in a new issue