mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-20 00:31:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

tests/check/elements/adder.c: Don't set timeout to 6 seconds when we're running in valgrind ... (and how is 6 seconds...

Browse source 
Original commit message from CVS:
* 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?)
This commit is contained in:
Tim-Philipp Müller 2006-09-28 11:34:05 +00:00
parent e10e9eeff2
commit b510907b77
3 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -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 <wim@fluendo.com> 2006-09-28 Wim Taymans <wim@fluendo.com>
* gst/audiorate/gstaudiorate.c: (gst_audio_rate_reset), * gst/audiorate/gstaudiorate.c: (gst_audio_rate_reset),

2
common

@ -1 +1 @@
Subproject commit a8c15b7a2c75fc2bd83850cb17cb05a1ee84ecaf Subproject commit bdd0108b3540ffadeb82cee28b8867a8a6e7ae78

22
tests/check/elements/adder.c
View file

@ -1,6 +1,6 @@
/* GStreamer /* GStreamer
* *
* unit test for volume * unit test for adder
* *
* Copyright (C) <2005> Thomas Vander Stichele <thomas at apestaart dot org> * Copyright (C) <2005> Thomas Vander Stichele <thomas at apestaart dot org>
* *
@ -20,6 +20,14 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#ifdef HAVE_VALGRIND
# include <valgrind/valgrind.h>
#endif
#include <unistd.h> #include <unistd.h>
#include <gst/check/gstcheck.h> #include <gst/check/gstcheck.h>
@ -441,7 +449,7 @@ GST_START_TEST (test_remove_pad)
GST_END_TEST; GST_END_TEST;
Suite * static Suite *
adder_suite (void) adder_suite (void)
{ {
Suite *s = suite_create ("adder"); Suite *s = suite_create ("adder");
@ -454,7 +462,15 @@ adder_suite (void)
tcase_add_test (tc_chain, test_remove_pad); tcase_add_test (tc_chain, test_remove_pad);
/* Use a longer timeout */ /* Use a longer timeout */
tcase_set_timeout (tc_chain, 6); #ifdef HAVE_VALGRIND
if (RUNNING_ON_VALGRIND) {
tcase_set_timeout (tc_chain, 5 * 60);
} else
#endif
{
/* this is shorter than the default 60 seconds?! (tpm) */
/* tcase_set_timeout (tc_chain, 6); */
}
return s; return s;
} }