diff options
author | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2012-04-05 21:17:48 +0400 |
---|---|---|
committer | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2012-04-05 21:17:48 +0400 |
commit | 6a0339bf24389e2cb07f747a10feaa8a36c11a5c (patch) | |
tree | 61c4644ced2e4924de2ab27950ae88d73ba03c39 | |
parent | 0c49dcd0c6e5be5bcfff1e545fcfc8eee962be52 (diff) |
tests: make few tests more valgrind-friendly
-rw-r--r-- | tests/check/elements/flvmux.c | 18 | ||||
-rw-r--r-- | tests/check/elements/interleave.c | 26 |
2 files changed, 35 insertions, 9 deletions
diff --git a/tests/check/elements/flvmux.c b/tests/check/elements/flvmux.c index 6993f876b..a9b2bd1a5 100644 --- a/tests/check/elements/flvmux.c +++ b/tests/check/elements/flvmux.c @@ -18,6 +18,14 @@ * Boston, MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#ifdef HAVE_VALGRIND +# include <valgrind/valgrind.h> +#endif + #include <gst/check/gstcheck.h> #include <gst/gst.h> @@ -149,9 +157,17 @@ flvmux_suite (void) { Suite *s = suite_create ("flvmux"); TCase *tc_chain = tcase_create ("general"); + gint loop = 499; suite_add_tcase (s, tc_chain); - tcase_add_loop_test (tc_chain, test_index_writing, 1, 499); + +#ifdef HAVE_VALGRIND + if (RUNNING_ON_VALGRIND) { + loop = 140; + } +#endif + + tcase_add_loop_test (tc_chain, test_index_writing, 1, loop); return s; } diff --git a/tests/check/elements/interleave.c b/tests/check/elements/interleave.c index f48e3a3f5..b59aceefb 100644 --- a/tests/check/elements/interleave.c +++ b/tests/check/elements/interleave.c @@ -26,6 +26,10 @@ # include "config.h" #endif +#ifdef HAVE_VALGRIND +# include <valgrind/valgrind.h> +#endif + #include <gst/check/gstcheck.h> #include <gst/audio/audio.h> #include <gst/audio/audio-enumtypes.h> @@ -109,10 +113,13 @@ interleave_chain_func (GstPad * pad, GstObject * parent, GstBuffer * buffer) fail_unless_equals_int (map.size, 48000 * 2 * sizeof (gfloat)); fail_unless (outdata != NULL); - for (i = 0; i < 48000 * 2; i += 2) { - fail_unless_equals_float (outdata[i], input[0]); - fail_unless_equals_float (outdata[i + 1], input[1]); - } +#ifdef HAVE_VALGRIND + if (!(RUNNING_ON_VALGRIND)) +#endif + for (i = 0; i < 48000 * 2; i += 2) { + fail_unless_equals_float (outdata[i], input[0]); + fail_unless_equals_float (outdata[i + 1], input[1]); + } gst_buffer_unmap (buffer, &map); gst_buffer_unref (buffer); @@ -473,10 +480,13 @@ sink_handoff_float32 (GstElement * element, GstBuffer * buffer, GstPad * pad, gst_caps_unref (ccaps); gst_caps_unref (caps); - for (i = 0; i < 48000 * 2; i += 2) { - fail_unless_equals_float (data[i], -1.0); - fail_unless_equals_float (data[i + 1], 1.0); - } +#ifdef HAVE_VALGRIND + if (!(RUNNING_ON_VALGRIND)) +#endif + for (i = 0; i < 48000 * 2; i += 2) { + fail_unless_equals_float (data[i], -1.0); + fail_unless_equals_float (data[i + 1], 1.0); + } gst_buffer_unmap (buffer, &map); have_data++; |