diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-08-09 00:15:03 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-09-07 20:44:24 +0100 |
| commit | 728f5ba5fa569e30c05aaad2cafb7d1f87a823a4 (patch) | |
| tree | 6784a2b505e82e6c9c141d6fe340a745e401ed2a | |
| parent | 9ac0b2e7053104fe3758f09a5113ba17b04f566e (diff) | |
Use AG_GST_CHECK_GST_PLUGINS_{GOOD,UGLY,BAD,FFMPEG} macros from common
to find plugin directories for the various modules our unit tests depend
on in an uninstalled environment. This makes sure these plugins are found
even when distchecking (which happens from a subdirectory, which means
that the currently used trick to find the uninstalled directories of
these modules doesn't work in that case).
| m--------- | common | 0 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | tests/check/Makefile.am | 5 |
3 files changed, 8 insertions, 7 deletions
diff --git a/common b/common -Subproject aa0d1d0399c8095314394d869ceab21a371e6fb +Subproject 080e025f0789715c5762d716fadc7df51be5da3 diff --git a/configure.ac b/configure.ac index 044a82841..7adea3551 100644 --- a/configure.ac +++ b/configure.ac @@ -187,12 +187,14 @@ AG_GST_CHECK_GST_BASE($GST_MAJORMINOR, [$GST_REQ], yes) AG_GST_CHECK_GST_GDP($GST_MAJORMINOR, [$GST_REQ], yes) AG_GST_CHECK_GST_CHECK($GST_MAJORMINOR, [$GST_REQ], no) AG_GST_CHECK_GST_CONTROLLER($GST_MAJORMINOR, [$GST_REQ], yes) -AG_GST_CHECK_GST_PLUGINS_BASE($GST_MAJORMINOR, [$GSTPB_REQ], yes) AM_CONDITIONAL(HAVE_GST_CHECK, test "x$HAVE_GST_CHECK" = "xyes") -GSTPB_PLUGINS_DIR=`$PKG_CONFIG gstreamer-plugins-base-$GST_MAJORMINOR --variable pluginsdir` -AC_SUBST(GSTPB_PLUGINS_DIR) -AC_MSG_NOTICE(Using GStreamer Base Plugins in $GSTPB_PLUGINS_DIR) +AG_GST_CHECK_GST_PLUGINS_BASE($GST_MAJORMINOR, [$GSTPB_REQ], yes) + +dnl check for uninstalled plugin directories for unit tests +AG_GST_CHECK_GST_PLUGINS_GOOD($GST_MAJORMINOR, [0.10.25]) +AG_GST_CHECK_GST_PLUGINS_UGLY($GST_MAJORMINOR, [0.10.16]) +AG_GST_CHECK_GST_PLUGINS_FFMPEG($GST_MAJORMINOR, [0.10.11]) dnl Check for documentation xrefs GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`" diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index 03452b474..2e1f01641 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -7,12 +7,11 @@ GST_TOOLS_DIR = $(top_builddir)/tools REGISTRY_ENVIRONMENT = \ GST_REGISTRY=$(CHECK_REGISTRY) -# FIXME: the PLUGIN_PATH has a hack to reach good for now -# decide if it's worth it to add a .pc file for this, plus a dependancy on it +# GST_PLUGINS_XYZ_DIR is only set in an uninstalled setup TESTS_ENVIRONMENT = \ $(REGISTRY_ENVIRONMENT) \ GST_PLUGIN_SYSTEM_PATH= \ - GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/sys:$(top_builddir)/ext:$(top_builddir)/../gst-ffmpeg/ext/ffmpeg:$(top_builddir)/../gst-plugins-good/gst:$(top_builddir)/../gst-plugins-good/sys:$(top_builddir)/../gst-plugins-good/ext:$(top_builddir)/../gst-plugins-ugly/gst:$(top_builddir)/../gst-plugins-ugly/sys:$(top_builddir)/../gst-plugins-ugly/ext:$(GSTPB_PLUGINS_DIR):$(GST_PLUGINS_DIR) \ + GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/sys:$(top_builddir)/ext:$(GST_PLUGINS_FFMPEG_DIR):$(GST_PLUGINS_UGLY_DIR):$(GST_PLUGINS_GOOD_DIR):$(GST_PLUGINS_BASE_DIR):$(GST_PLUGINS_DIR) \ GST_PLUGIN_LOADING_WHITELIST="gstreamer@$(GST_PLUGINS_DIR):gst-plugins-base@$(GSTPB_PLUGINS_DIR):gst-plugins-good:gst-plugins-ugly:gst-ffmpeg:gst-plugins-bad@$(top_builddir)" \ STATE_IGNORE_ELEMENTS="alsaspdifsink apexsink camerabin cdaudio dc1394src dccpclientsrc dccpclientsink dccpserversrc dccpserversink dvbsrc dvbbasebin dfbvideosink festival gsettingsvideosrc gsettingsvideosink gsettingsaudiosrc gsettingsaudiosink nassink rsndvdbin sdlaudiosink sdlvideosink vcdsrc rfbsrc vdpauyuvvideo vdpauvideoyuv vdpaumpegdec neonhttpsrc" |