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.

diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 6a902cd..48f7075 100644 (file)
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -4,15 +4,14 @@ 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 = \
-        CK_DEFAULT_TIMEOUT=120                                  \
-        GST_STATE_IGNORE_ELEMENTS="$(STATE_IGNORE_ELEMENTS)"   \
+       CK_DEFAULT_TIMEOUT=120                                  \
+       GST_STATE_IGNORE_ELEMENTS="$(STATE_IGNORE_ELEMENTS)"    \
        $(REGISTRY_ENVIRONMENT)                                 \
-       GST_PLUGIN_SYSTEM_PATH=                                 \
-       GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/sys:$(top_builddir)/ext:$(GST_PLUGINS_DIR) \
-       GST_PLUGIN_PATH_1_0=$$GST_PLUGIN_PATH                   \
+       GST_PLUGIN_SYSTEM_PATH_1_0=                             \
+       GST_PLUGIN_PATH_1_0=$(top_builddir)/gst:$(top_builddir)/sys:$(top_builddir)/ext:$(GST_PLUGINS_DIR) \
        GST_PLUGIN_LOADING_WHITELIST="gstreamer:gst-plugins-base@$(top_builddir)" \
        GST_TAG_LICENSE_TRANSLATIONS_DICT="$(top_srcdir)/gst-libs/gst/tag/license-translations.dict"