tests: use _1_0 variants for the various registry variables
authorMartin Pitt <martinpitt@gnome.org>
Tue, 15 Jan 2013 14:05:43 +0000 (15:05 +0100)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Wed, 16 Jan 2013 11:10:19 +0000 (11:10 +0000)
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

index 1a616cf..3afa882 100644 (file)
@@ -4,12 +4,12 @@ CHECK_REGISTRY = $(top_builddir)/tests/check/test-registry.reg
 TEST_FILES_DIRECTORY = $(top_srcdir)/tests/files
 
 REGISTRY_ENVIRONMENT = \
-       GST_REGISTRY=$(CHECK_REGISTRY)
+       GST_REGISTRY_1_0=$(CHECK_REGISTRY)
 
 TESTS_ENVIRONMENT = \
        $(REGISTRY_ENVIRONMENT)                                 \
-       GST_PLUGIN_SYSTEM_PATH=                                 \
-       GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/ext:$(top_builddir)/sys:$(GSTPB_PLUGINS_DIR):$(GST_PLUGINS_DIR)                     \
+       GST_PLUGIN_SYSTEM_PATH_1_0=                             \
+       GST_PLUGIN_PATH_1_0=$(top_builddir)/gst:$(top_builddir)/ext:$(top_builddir)/sys:$(GSTPB_PLUGINS_DIR):$(GST_PLUGINS_DIR)                 \
        GST_PLUGIN_LOADING_WHITELIST="gstreamer@$(GST_PLUGINS_DIR):gst-plugins-base@$(GSTPB_PLUGINS_DIR):gst-plugins-good@$(top_builddir)"      \
        GST_STATE_IGNORE_ELEMENTS="aasink autoaudiosrc autoaudiosink autovideosrc autovideosink \
                cacasink cairotextoverlay \