tests: use GST_*_1_0 environment variables everywhere
authorTim-Philipp Müller <tim.muller@collabora.co.uk>
Wed, 16 Jan 2013 12:09:39 +0000 (12:09 +0000)
committerTim-Philipp Müller <tim.muller@collabora.co.uk>
Wed, 16 Jan 2013 12:09:39 +0000 (12:09 +0000)
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.

tests/check/Makefile.am

index 67fb318..41e7d4a 100644 (file)
@@ -4,12 +4,12 @@ CHECK_REGISTRY = $(top_builddir)/tests/check/test-registry.xml
 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)/../gst-plugins-good/gst:$(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)/../gst-plugins-good/gst:$(GSTPB_PLUGINS_DIR):$(GST_PLUGINS_DIR)
 
 # ths core dumps of some machines have PIDs appended
 CLEANFILES = core.* test-registry.xml