[gst-cvs] ds gstreamer: gstreamer/ gstreamer/testsuite/caps/

[David S. <ds...@pd...>]

CVS Root:       /home/cvs/gstreamer
Module:         gstreamer
Changes by:     ds
Date:           Mon May 03 2004  23:24:00 PDT

Log message:
* testsuite/caps/deserialize.c: (main): Fix problems noticed
by the build bots.
* testsuite/caps/renegotiate.c: (main): Same.

Modified files:
    .               : ChangeLog
    testsuite/caps  : deserialize.c renegotiate.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.506&r2=1.507
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/testsuite/caps/deserialize.c.diff?r1=1.2&r2=1.3
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/testsuite/caps/renegotiate.c.diff?r1=1.1&r2=1.2

====Begin Diffs====
Index: deserialize.c
===================================================================
RCS file: /home/cvs/gstreamer/gstreamer/testsuite/caps/deserialize.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/deserialize.c	4 May 2004 02:30:11 -0000	1.2
+++ b/deserialize.c	4 May 2004 06:23:48 -0000	1.3
@@ -29,13 +29,14 @@
     const char *srcdir = g_getenv ("srcdir");
 
     if (srcdir) {
-      filename = g_build_filename (srcdir, "caps_strings");
+      filename = g_build_filename (srcdir, "caps_strings", NULL);
     } else {
       filename = g_strdup ("caps_strings");
     }
   }
   if (!g_file_get_contents (filename, &data, &length, NULL)) {
+    g_print ("could not open file %s\n", filename);
     abort ();
Index: renegotiate.c
RCS file: /home/cvs/gstreamer/gstreamer/testsuite/caps/renegotiate.c,v
retrieving revision 1.1
diff -u -d -r1.1 -r1.2
--- a/renegotiate.c	4 May 2004 02:33:41 -0000	1.1
+++ b/renegotiate.c	4 May 2004 06:23:48 -0000	1.2
@@ -67,6 +67,12 @@
       "audio/x-raw-int, channels=2, rate=48000;"
       "audio/x-raw-int, channels=1, rate=44100 !" "fakesink", NULL);
+  if (pipeline == NULL) {
+    g_print
+        ("oops, couldn't build pipeline.  You probably don't have audioconvert or sinesrc\n");
+    exit (0);
+  }
+
   list = gst_bin_get_list (GST_BIN (pipeline));
   while (list) {
     GstElement *element = GST_ELEMENT (list->data);
Index: ChangeLog
RCS file: /home/cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.506
retrieving revision 1.507
diff -u -d -r1.506 -r1.507
--- a/ChangeLog	4 May 2004 02:33:41 -0000	1.506
+++ b/ChangeLog	4 May 2004 06:23:48 -0000	1.507
@@ -1,5 +1,11 @@
 2004-05-03  David Schleef  <ds...@sc...>
+	* testsuite/caps/deserialize.c: (main): Fix problems noticed
+	  by the build bots.
+	* testsuite/caps/renegotiate.c: (main): Same.
+2004-05-03  David Schleef  <ds...@sc...>
 	* testsuite/caps/renegotiate.c: (my_fixate), (main): Another test.