diff options
| author | Jan Schmidt <thaytan@noraisin.net> | 2009-06-05 19:25:54 +0100 |
|---|---|---|
| committer | Jan Schmidt <thaytan@noraisin.net> | 2009-06-05 19:25:54 +0100 |
| commit | 5e176f4b0c3795d6b403fbb8dd5a040f2e9c1a18 (patch) | |
| tree | 91eca22552459487a74e03fed12561b59cc6293f /tests | |
| parent | 0823e9fa148375a5215f820a4a036ef952c50b2d (diff) | |
Moved 'x264enc' from -bad to -ugly
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/check/Makefile.am | 9 | ||||
| -rw-r--r-- | tests/check/elements/.gitignore | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index c1867b90..522d0c57 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -36,11 +36,18 @@ else MPEG2DEC = endif +if USE_X264 +check_x264enc=elements/x264enc +else +check_x264enc= +endif + check_PROGRAMS = \ generic/states \ $(AMRNB) \ $(LAME) \ $(MPEG2DEC) \ + $(check_x264enc) \ elements/xingmux # these tests don't even pass @@ -52,7 +59,7 @@ 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_TESTS_DISABLE = elements/x264enc SUPPRESSIONS = $(top_srcdir)/common/gst.supp $(srcdir)/gst-plugins-ugly.supp diff --git a/tests/check/elements/.gitignore b/tests/check/elements/.gitignore index ace39484..c2c4108e 100644 --- a/tests/check/elements/.gitignore +++ b/tests/check/elements/.gitignore @@ -1,4 +1,5 @@ amrnbenc mpeg2dec +x264enc xingmux .dirstamp |