From e358ec6dddde2dc26a6acb921cbe607a0b56f48c Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 15 Jan 2013 15:02:37 +0100 Subject: [PATCH] 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. --- tests/check/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index 4ed36042f9..51d560eca6 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -6,13 +6,13 @@ TEST_FILES_DIRECTORY = $(top_srcdir)/tests/files GST_TOOLS_DIR = $(top_builddir)/tools REGISTRY_ENVIRONMENT = \ - GST_REGISTRY=$(CHECK_REGISTRY) + GST_REGISTRY_1_0=$(CHECK_REGISTRY) # GST_PLUGINS_XYZ_DIR is only set in an uninstalled setup TESTS_ENVIRONMENT = \ $(REGISTRY_ENVIRONMENT) \ - GST_PLUGIN_SYSTEM_PATH= \ - 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_SYSTEM_PATH_1_0= \ + 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_STATE_IGNORE_ELEMENTS="apexsink camerabin cdaudio dc1394src \ dccpclientsrc dccpclientsink dccpserversrc dccpserversink decklinksrc \