tests: Properly setup GST_PLUGIN_PATH in test environement

diff --git a/configure.ac b/configure.ac
index a92cab7..c4ed1b9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -236,6 +236,8 @@ AG_GST_CHECK_GST_BASE($GST_API_VERSION, [$GST_REQ], yes)
 AG_GST_CHECK_GST_CHECK($GST_API_VERSION, [$GST_REQ], no)
 AG_GST_CHECK_GST_CONTROLLER($GST_API_VERSION, [$GST_REQ], yes)
 AG_GST_CHECK_GST_PLUGINS_BASE($GST_API_VERSION, [$GSTPB_REQ], yes)
+AG_GST_CHECK_GST_PLUGINS_BAD($GST_API_VERSION, [$GST_REQ], yes)
+AG_GST_CHECK_GST_PLUGINS_GOOD($GST_API_VERSION, [$GST_REQ], yes)
 AM_CONDITIONAL(HAVE_GST_CHECK, test "x$HAVE_GST_CHECK" = "xyes")
 
 AG_GST_ARG_WITH_PLUGINS

diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 4003fc1..039291f 100644 (file)
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -1,6 +1,13 @@
 include $(top_srcdir)/common/check.mak
 
-AM_TESTS_ENVIRONMENT = 
+REGISTRY_ENVIRONMENT = \
+       GST_REGISTRY_1_0=$(CHECK_REGISTRY)
+
+# GST_PLUGINS_XYZ_DIR is only set in an uninstalled setup
+AM_TESTS_ENVIRONMENT = \
+       $(REGISTRY_ENVIRONMENT)                                 \
+       GST_PLUGIN_SYSTEM_PATH_1_0=                             \
+       GST_PLUGIN_PATH_1_0=$(top_builddir)/plugins:$(GST_PLUGINS_BAD_DIR):$(GST_PLUGINS_LIBAV_DIR):$(GST_PLUGINS_UGLY_DIR):$(GST_PLUGINS_GOOD_DIR):$(GST_PLUGINS_BASE_DIR):$(GST_PLUGINS_DIR)
 
 plugindir = $(libdir)/gstreamer-@GST_API_VERSION@