summaryrefslogtreecommitdiffstats
path: root/tests/check/Makefile.am
diff options
context:
space:
mode:
authorMark Nauwelaerts <manauw@skynet.be>2008-03-05 06:03:03 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2008-03-05 06:03:03 +0000
commitacb81c58c547b0e6155fd61b7914f39deea428ad (patch)
tree8427c825ea71f1fee1dbc46b37e4b9d35d6a14c8 /tests/check/Makefile.am
parent646ac4cdf2054e5cd38c1869701a4e839f8436b2 (diff)
downloadgst-plugins-bad-acb81c58c547b0e6155fd61b7914f39deea428ad.tar.gz
gst-plugins-bad-acb81c58c547b0e6155fd61b7914f39deea428ad.tar.bz2
gst-plugins-bad-acb81c58c547b0e6155fd61b7914f39deea428ad.zip
Port mplex element to 0.10. Fixes bug #520329.
Original commit message from CVS: Patch by: Mark Nauwelaerts <manauw at skynet dot be> * configure.ac: * ext/Makefile.am: * ext/mplex/Makefile.am: * ext/mplex/gstmplex.cc: * ext/mplex/gstmplex.hh: * ext/mplex/gstmplexibitstream.cc: * ext/mplex/gstmplexibitstream.hh: * ext/mplex/gstmplexjob.cc: * ext/mplex/gstmplexjob.hh: * ext/mplex/gstmplexoutputstream.cc: * ext/mplex/gstmplexoutputstream.hh: Port mplex element to 0.10. Fixes bug #520329. * tests/check/Makefile.am: * tests/check/elements/mplex.c: (test_sink_event), (setup_src_pad), (teardown_src_pad), (setup_mplex), (cleanup_mplex), (GST_START_TEST), (mplex_suite), (main): Add unit test for the mplex element.
Diffstat (limited to 'tests/check/Makefile.am')
-rw-r--r--tests/check/Makefile.am10
1 files changed, 9 insertions, 1 deletions
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 0cc65741..abaf2300 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -35,6 +35,12 @@ else
check_mpeg2enc =
endif
+if USE_MPLEX
+check_mplex = elements/mplex
+else
+check_mplex =
+endif
+
if USE_NEON
check_neon = elements/neonhttpsrc
else
@@ -55,7 +61,8 @@ endif
VALGRIND_TO_FIX = \
- elements/mpeg2enc
+ elements/mpeg2enc \
+ elements/mplex
# valgrind testing
VALGRIND_TESTS_DISABLE = \
@@ -64,6 +71,7 @@ VALGRIND_TESTS_DISABLE = \
check_PROGRAMS = \
generic/states \
$(check_mpeg2enc) \
+ $(check_mplex) \
$(check_neon) \
$(check_soup) \
$(check_timidity) \