diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-02-22 14:11:59 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-02-22 14:11:59 +0100 |
| commit | 238b9a57cc022aec7ebd52d908ac5e24d76c3183 (patch) | |
| tree | 9563e2353a2c427a40fae0e7de0ed73c2348c402 /libs/gst/check | |
| parent | 90fff577f0661c1ec7a0f2c324d5b69d1d1d040e (diff) | |
| parent | cc5edeefcd7772ac645fa0b8b91cfe7be201d78a (diff) | |
Merge branch 'master' into 0.11
Conflicts:
configure.ac
gst/gstelement.c
gst/gstelement.h
gst/gstpad.c
gst/gstutils.c
libs/gst/base/Makefile.am
libs/gst/check/Makefile.am
libs/gst/controller/Makefile.am
libs/gst/dataprotocol/Makefile.am
libs/gst/net/Makefile.am
win32/common/libgstreamer.def
Diffstat (limited to 'libs/gst/check')
| -rw-r--r-- | libs/gst/check/Makefile.am | 4 | ||||
| -rw-r--r-- | libs/gst/check/gstcheck.c | 7 | ||||
| -rw-r--r-- | libs/gst/check/gstconsistencychecker.c | 1 |
3 files changed, 10 insertions, 2 deletions
diff --git a/libs/gst/check/Makefile.am b/libs/gst/check/Makefile.am index 0040ba5e3..567c3a2b0 100644 --- a/libs/gst/check/Makefile.am +++ b/libs/gst/check/Makefile.am @@ -121,8 +121,12 @@ GstCheck-@GST_MAJORMINOR@.gir: $(INTROSPECTION_SCANNER) libgstcheck-@GST_MAJORMI --strip-prefix=Gst \ -I$(top_srcdir) \ -I$(top_srcdir)/libs \ + -I$(top_builddir) \ + -I$(top_builddir)/libs \ $(gir_cincludes) \ --add-include-path=$(top_builddir)/gst \ + --library-path=$(top_builddir)/gst \ + --library=$(top_builddir)/gst/libgstreamer-0.11.la \ --library=libgstcheck-0.11.la \ --include=Gst-0.11 \ --libtool="$(top_builddir)/libtool" \ diff --git a/libs/gst/check/gstcheck.c b/libs/gst/check/gstcheck.c index 77634c22c..c4370a3ae 100644 --- a/libs/gst/check/gstcheck.c +++ b/libs/gst/check/gstcheck.c @@ -571,19 +571,22 @@ gst_check_abi_list (GstCheckABIStruct list[], gboolean have_abi_sizes) gint gst_check_run_suite (Suite * suite, const gchar * name, const gchar * fname) { + SRunner *sr; + gchar *xmlfilename = NULL; gint nf; - SRunner *sr = srunner_create (suite); + sr = srunner_create (suite); if (g_getenv ("GST_CHECK_XML")) { /* how lucky we are to have __FILE__ end in .c */ - gchar *xmlfilename = g_strdup_printf ("%sheck.xml", fname); + xmlfilename = g_strdup_printf ("%sheck.xml", fname); srunner_set_xml (sr, xmlfilename); } srunner_run_all (sr, CK_NORMAL); nf = srunner_ntests_failed (sr); + g_free (xmlfilename); srunner_free (sr); return nf; } diff --git a/libs/gst/check/gstconsistencychecker.c b/libs/gst/check/gstconsistencychecker.c index 5253b4c99..ded047e1d 100644 --- a/libs/gst/check/gstconsistencychecker.c +++ b/libs/gst/check/gstconsistencychecker.c @@ -79,6 +79,7 @@ source_pad_data_cb (GstPad * pad, GstMiniObject * data, break; case GST_EVENT_TAG: GST_DEBUG_OBJECT (pad, "tag %" GST_PTR_FORMAT, event->structure); + /* fall through */ default: if (GST_EVENT_IS_SERIALIZED (event) && GST_EVENT_IS_DOWNSTREAM (event)) { fail_if (consist->eos, "Event received after EOS"); |