diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/check/Makefile.am | 10 | ||||
-rw-r--r-- | tests/icles/Makefile.am | 7 | ||||
-rw-r--r-- | tests/icles/videocrop-test.c | 2 |
3 files changed, 17 insertions, 2 deletions
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index 7357468c..195f0373 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -62,6 +62,7 @@ check_PROGRAMS = \ elements/level \ elements/matroskamux \ elements/icydemux \ + elements/videocrop \ elements/videofilter \ $(check_sunaudio) \ $(check_taglib) \ @@ -80,7 +81,10 @@ AM_CFLAGS = $(GST_OBJ_CFLAGS) $(GST_CHECK_CFLAGS) $(CHECK_CFLAGS) LDADD = $(GST_OBJ_LIBS) $(GST_CHECK_LIBS) $(CHECK_LIBS) # valgrind testing -VALGRIND_TESTS_DISABLE = $(VALGRIND_TO_FIX) +# videocrop disabled since it takes way too long in valgrind +VALGRIND_TESTS_DISABLE = \ + elements/videocrop \ + $(VALGRIND_TO_FIX) SUPPRESSIONS = $(top_srcdir)/common/gst.supp @@ -103,3 +107,7 @@ elements_sunaudio_CFLAGS = \ elements_sunaudio_LDADD = \ $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-@GST_MAJORMINOR@ \ $(LDADD) + +elements_videocrop_LDADD = $(LDADD) $(GST_BASE_LIBS) +elements_videocrop_CFLAGS = $(CFLAGS) $(AM_CFLAGS) $(GST_BASE_CFLAGS) + diff --git a/tests/icles/Makefile.am b/tests/icles/Makefile.am index dd415ef8..9f5ddc9d 100644 --- a/tests/icles/Makefile.am +++ b/tests/icles/Makefile.am @@ -21,5 +21,10 @@ else X_TESTS = endif -noinst_PROGRAMS = $(V4L2_TESTS) $(X_TESTS) +videocrop_test_SOURCES = videocrop-test.c +videocrop_test_CFLAGS = $(GST_CFLAGS) +videocrop_test_LDADD = $(GST_LIBS) +videocrop_test_LDFLAGS = $(GST_PLUGIN_LDFLAGS) + +noinst_PROGRAMS = $(V4L2_TESTS) $(X_TESTS) videocrop-test diff --git a/tests/icles/videocrop-test.c b/tests/icles/videocrop-test.c index 1c7ae4ba..da84f25c 100644 --- a/tests/icles/videocrop-test.c +++ b/tests/icles/videocrop-test.c @@ -34,7 +34,9 @@ GST_DEBUG_CATEGORY_STATIC (videocrop_test_debug); #define TIME_PER_TEST 10 /* seconds each format is tested */ #define FRAMERATE 15 /* frames per second */ +#ifndef DEFAULT_VIDEOSINK #define DEFAULT_VIDEOSINK "xvimagesink" +#endif static gboolean check_bus_for_errors (GstBus * bus, GstClockTime max_wait_time) |