diff options
| author | Thibault Saunier <tsaunier@gnome.org> | 2015-11-21 00:23:02 +0100 |
|---|---|---|
| committer | Thibault Saunier <tsaunier@gnome.org> | 2015-12-11 14:47:00 +0100 |
| commit | de06d82899eb0450c975a25d3cd88ad0a4dfed38 (patch) | |
| tree | c8f4ceebb4fe04dbe26304170f62b8f860f0eb5c | |
| parent | 0ae1ea94e18b717fadc3420acace54d917c5244b (diff) | |
tests: Properly setup GST_PLUGIN_PATH in test environement
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | tests/check/Makefile.am | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 77cc0e03..295a9bc0 100644 --- a/configure.ac +++ b/configure.ac @@ -233,6 +233,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 4003fc1a..039291f1 100644 --- 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@ |