tests/check/generic/sinks.c: Put back the tcase_set_timeout(), apparently it's needed...

Original commit message from CVS:
* tests/check/generic/sinks.c: (gst_sinks_suite):
Put back the tcase_set_timeout(), apparently it's needed after
all; fix it up in a way that makes things work with valgrind too.

diff --git a/ChangeLog b/ChangeLog
index 565e34b..c1bd11e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,20 @@
+2007-12-30  Tim-Philipp Müller  <tim at centricular dot net>
+
+       * tests/check/generic/sinks.c: (gst_sinks_suite):
+         Put back the tcase_set_timeout(), apparently it's needed after
+         all; fix it up in a way that makes things work with valgrind too.
+
+2007-12-30  Tim-Philipp Müller  <tim at centricular dot net>
+
+       * gst/gst_private.h: (STRUCTURE_ESTIMATED_STRING_LEN):
+       * gst/gstcaps.c: (gst_caps_to_string):
+       * gst/gststructure.c: (GST_ASCII_IS_STRING),
+         (priv_gst_structure_append_to_gstring), (gst_structure_to_string):
+
 2007-12-30  Thijs Vermeir  <thijsvermeir@gmail.com>
 
        * gst/gstdebugutils.c:
-       add warning when failed to open file for writing
+         Add warning when failed to open file for writing.
 
 2007-12-28  Tim-Philipp Müller  <tim at centricular dot net>
 

diff --git a/tests/check/generic/sinks.c b/tests/check/generic/sinks.c
index 701d2c5..1002fc1 100644 (file)
--- a/tests/check/generic/sinks.c
+++ b/tests/check/generic/sinks.c
@@ -1249,6 +1249,13 @@ gst_sinks_suite (void)
 {
   Suite *s = suite_create ("Sinks");
   TCase *tc_chain = tcase_create ("general");
+  guint timeout = 10;
+
+  /* time out after 10s, not the default 3, we need this for the last test.
+   * We need a longer timeout when running under valgrind though. */
+  if (g_getenv ("CK_DEFAULT_TIMEOUT") != NULL)
+    timeout = MAX (10, atoi (g_getenv ("CK_DEFAULT_TIMEOUT")));
+  tcase_set_timeout (tc_chain, timeout);
 
   suite_add_tcase (s, tc_chain);
   tcase_add_test (tc_chain, test_sink);