[gst-cvs] thomasvs gst-plugins-base: gst-plugins-base/check/ gst-plugins-base/check/elements/

[<tho...@fr...>]

CVS Root:       /cvs/gstreamer
Module:         gst-plugins-base
Changes by:     thomasvs
Date:           Sun Aug 21 2005  10:44:22 PDT

Log message:
make sure registry is built properly

Modified files:
    check           : Makefile.am
    check/elements  : vorbisdec.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/check/Makefile.am.diff?r1=1.2&r2=1.3
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/check/elements/vorbisdec.c.diff?r1=1.2&r2=1.3

====Begin Diffs====
Index: Makefile.am
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-base/check/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	20 Aug 2005 20:40:24 -0000	1.2
+++ Makefile.am	21 Aug 2005 17:44:09 -0000	1.3
@@ -1,10 +1,15 @@
 include $(top_srcdir)/common/check.mak
 
-CHECK_REGISTRY=$(top_builddir)/check/test-registry.xml
+CHECK_REGISTRY = $(top_builddir)/check/test-registry.xml
-TESTS_ENVIRONMENT=\
+REGISTRY_ENVIRONMENT = \
 	GST_REGISTRY=$(CHECK_REGISTRY)
+TESTS_ENVIRONMENT = \
+	$(REGISTRY_ENVIRONMENT)					\
+	GST_PLUGIN_PATH_ONLY=yes				\
+	GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/ext
+
 # ths core dumps of some machines have PIDs appended
 CLEANFILES = core.* test-registry.xml
@@ -12,8 +17,6 @@
 $(CHECK_REGISTRY):
 	$(TESTS_ENVIRONMENT)					\
-	GST_PLUGIN_PATH_ONLY=yes				\
-	GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/ext	\
 	$(GST_TOOLS_DIR)/gst-register-@GST_MAJORMINOR@
 TESTS = $(GST_TOOLS_DIR)/gst-register-@GST_MAJORMINOR@		\
Index: vorbisdec.c
RCS file: /cvs/gstreamer/gst-plugins-base/check/elements/vorbisdec.c,v
--- vorbisdec.c	21 Aug 2005 10:43:45 -0000	1.2
+++ vorbisdec.c	21 Aug 2005 17:44:09 -0000	1.3
@@ -69,7 +69,6 @@
 setup_vorbisdec ()
 {
   GstElement *vorbisdec;
-  GstPad *srcpad, *sinkpad;
   GST_DEBUG ("setup_vorbisdec");
   vorbisdec = gst_check_setup_element ("vorbisdec");
@@ -82,8 +81,6 @@
 void
 cleanup_vorbisdec (GstElement * vorbisdec)
-
   GST_DEBUG ("cleanup_vorbisdec");
   gst_check_teardown_src_pad (vorbisdec);