From: <tp...@ke...> - 2006-09-28 11:34:20
|
CVS Root: /cvs/gstreamer Module: gst-plugins-base Changes by: tpm Date: Thu Sep 28 2006 11:34:17 UTC Log message: * tests/check/elements/adder.c: (adder_suite): Don't set timeout to 6 seconds when we're running in valgrind ... (and how is 6 seconds longer than the default anyway?) Modified files: . : ChangeLog tests/check/elements: adder.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ChangeLog.diff?r1=1.2928&r2=1.2929 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/tests/check/elements/adder.c.diff?r1=1.10&r2=1.11 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-base/ChangeLog,v retrieving revision 1.2928 retrieving revision 1.2929 diff -u -d -r1.2928 -r1.2929 --- ChangeLog 28 Sep 2006 10:49:55 -0000 1.2928 +++ ChangeLog 28 Sep 2006 11:34:05 -0000 1.2929 @@ -1,3 +1,10 @@ +2006-09-28 Tim-Philipp Müller <tim at centricular dot net> + + * tests/check/elements/adder.c: (adder_suite): + Don't set timeout to 6 seconds when we're running + in valgrind ... (and how is 6 seconds longer than + the default anyway?) 2006-09-28 Wim Taymans <wi...@fl...> * gst/audiorate/gstaudiorate.c: (gst_audio_rate_reset), Index: adder.c RCS file: /cvs/gstreamer/gst-plugins-base/tests/check/elements/adder.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- adder.c 30 May 2006 16:07:50 -0000 1.10 +++ adder.c 28 Sep 2006 11:34:05 -0000 1.11 @@ -1,6 +1,6 @@ /* GStreamer * - * unit test for volume + * unit test for adder * Copyright (C) <2005> Thomas Vander Stichele <thomas at apestaart dot org> @@ -20,6 +20,14 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +# include <config.h> +#endif +#ifdef HAVE_VALGRIND +# include <valgrind/valgrind.h> #include <unistd.h> #include <gst/check/gstcheck.h> @@ -441,7 +449,7 @@ GST_END_TEST; -Suite * +static Suite * adder_suite (void) { Suite *s = suite_create ("adder"); @@ -454,7 +462,15 @@ tcase_add_test (tc_chain, test_remove_pad); /* Use a longer timeout */ - tcase_set_timeout (tc_chain, 6); + if (RUNNING_ON_VALGRIND) { + tcase_set_timeout (tc_chain, 5 * 60); + } else + { + /* this is shorter than the default 60 seconds?! (tpm) */ + /* tcase_set_timeout (tc_chain, 6); */ + } return s; } |