[gst-cvs] thomasvs gst-plugins-good: gst-plugins-good/ gst-plugins-good/tests/check/ gst-plugins-good/tests/check/elements/

[<tho...@ke...>]

CVS Root:       /cvs/gstreamer
Module:         gst-plugins-good
Changes by:     thomasvs
Date:           Tue May 02 2006  13:24:50 UTC

Log message:
        * configure.ac:
          figure out where plugins-base plugins are
        * tests/check/Makefile.am:
          use plugins-base plugins, so we have typefind functions
        * tests/check/elements/id3v2mux.c: (test_taglib_id3mux_with_tags):
          increase num-buffers, this makes sure the test errors out instead
          of timing out when no typefind functions are present

Modified files:
    .               : ChangeLog configure.ac
    tests/check     : Makefile.am
    tests/check/elements: id3v2mux.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ChangeLog.diff?r1=1.2314&r2=1.2315
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/configure.ac.diff?r1=1.652&r2=1.653
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/tests/check/Makefile.am.diff?r1=1.13&r2=1.14
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/tests/check/elements/id3v2mux.c.diff?r1=1.3&r2=1.4

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/ChangeLog,v
retrieving revision 1.2314
retrieving revision 1.2315
diff -u -d -r1.2314 -r1.2315
--- ChangeLog	1 May 2006 11:46:33 -0000	1.2314
+++ ChangeLog	2 May 2006 13:24:38 -0000	1.2315
@@ -1,3 +1,13 @@
+2006-05-02  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* configure.ac:
+	  figure out where plugins-base plugins are
+	* tests/check/Makefile.am:
+	  use plugins-base plugins, so we have typefind functions
+	* tests/check/elements/id3v2mux.c: (test_taglib_id3mux_with_tags):
+	  increase num-buffers, this makes sure the test errors out instead
+	  of timing out when no typefind functions are present
 2006-05-01  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* docs/plugins/Makefile.am:
Index: configure.ac
RCS file: /cvs/gstreamer/gst-plugins-good/configure.ac,v
retrieving revision 1.652
retrieving revision 1.653
diff -u -d -r1.652 -r1.653
--- configure.ac	1 May 2006 11:46:33 -0000	1.652
+++ configure.ac	2 May 2006 13:24:38 -0000	1.653
@@ -242,6 +242,10 @@
 fi
 AC_SUBST(GST_TOOLS_DIR)
+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)
 dnl FIXME: get rid of this by making sure gstreamer-check brings it in
 dnl check for "check", unit testing library/header
 AM_PATH_CHECK(0.9.2, HAVE_CHECK=yes, HAVE_CHECK=no)
Index: Makefile.am
RCS file: /cvs/gstreamer/gst-plugins-good/tests/check/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile.am	1 May 2006 11:46:33 -0000	1.13
+++ Makefile.am	2 May 2006 13:24:38 -0000	1.14
@@ -8,7 +8,7 @@
 TESTS_ENVIRONMENT = \
 	$(REGISTRY_ENVIRONMENT)					\
 	GST_PLUGIN_SYSTEM_PATH=					\
-	GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/ext:$(GST_PLUGINS_DIR)
+	GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/ext:$(GSTPB_PLUGINS_DIR):$(GST_PLUGINS_DIR)
 # ths core dumps of some machines have PIDs appended
 CLEANFILES = core.* test-registry.xml
@@ -27,12 +27,13 @@
 	elements/matroskamux \
 	elements/cmmldec \
 	elements/cmmlenc \
-	elements/icydemux
+	elements/icydemux \
+	$(check_taglib)
     
 TESTS = $(check_PROGRAMS)
 # these tests don't even pass
-noinst_PROGRAMS = $(check_taglib)
+noinst_PROGRAMS =
 AM_CFLAGS = $(GST_OBJ_CFLAGS) $(GST_CHECK_CFLAGS) $(CHECK_CFLAGS)
 LDADD = $(GST_OBJ_LIBS) $(GST_CHECK_LIBS) $(CHECK_LIBS)
Index: id3v2mux.c
RCS file: /cvs/gstreamer/gst-plugins-good/tests/check/elements/id3v2mux.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- id3v2mux.c	1 May 2006 11:46:33 -0000	1.3
+++ id3v2mux.c	2 May 2006 13:24:38 -0000	1.4
@@ -294,7 +294,7 @@
   /* set up source */
   g_object_set (fakesrc, "signal-handoffs", TRUE, "can-activate-pull", FALSE,
       "filltype", 2, "sizetype", 2, "sizemax", MP3_FRAME_SIZE,
-      "num-buffers", 16, NULL);
+      "num-buffers", 256, NULL);
   offset = 0;
   g_signal_connect (fakesrc, "handoff", G_CALLBACK (fill_mp3_buffer), &offset);