[FFmpeg-cvslog] fate: allow testing with libavfilter disabled

[Reinhard Tartler]

ffmpeg | branch: release/0.8 | Reinhard Tartler <siretart at tauware.de> | Wed Sep 28 00:50:08 2011 +0200| [9bb7a128a34fb5e4abcd265e5dfcb61787ad2f0f] | committer: Reinhard Tartler

fate: allow testing with libavfilter disabled

This declares dependencies to skip tests using libavfilter
when it is disabled.

Signed-off-by: Mans Rullgard <mans at mansr.com>
(cherry picked from commit 908f12f342341785bf0458e88a06d97a1af90339)

Conflicts:
	configure
	tests/Makefile
	tests/fate.mak

Signed-off-by: Reinhard Tartler <siretart at tauware.de>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9bb7a128a34fb5e4abcd265e5dfcb61787ad2f0f
---

 Makefile       |    7 +++++--
 configure      |    5 ++++-
 tests/fate.mak |    2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index d6bae76..d29872f 100644
--- a/Makefile
+++ b/Makefile
@@ -252,9 +252,12 @@ FATE_SEEK    = $(SEEK_TESTS:seek_%=fate-seek-%)
 FATE = $(FATE_ACODEC)                                                   \
        $(FATE_VCODEC)                                                   \
        $(FATE_LAVF)                                                     \
-       $(FATE_LAVFI)                                                    \
        $(FATE_SEEK)                                                     \
 
+FATE-$(CONFIG_AVFILTER) += $(FATE_LAVFI)
+
+FATE += $(FATE-yes)
+
 $(filter-out %-aref,$(FATE_ACODEC)): $(AREF)
 $(filter-out %-vref,$(FATE_VCODEC)): $(VREF)
 $(FATE_LAVF):   $(REFS)
@@ -276,7 +279,7 @@ fate-lavfi:  $(FATE_LAVFI)
 fate-seek:   $(FATE_SEEK)
 
 ifdef SAMPLES
-FATE += $(FATE_TESTS)
+FATE += $(FATE_TESTS) $(FATE_TESTS-yes)
 fate-rsync:
 	rsync -vaLW rsync://fate-suite.libav.org/fate-suite/ $(SAMPLES)
 else
diff --git a/configure b/configure
index 981b0fd..f4c3274 100755
--- a/configure
+++ b/configure
@@ -1504,7 +1504,7 @@ test_deps(){
         dep=${v%=*}
         tests=${v#*=}
         for name in ${tests}; do
-            eval ${name}_test_deps="'${dep}$suf1 ${dep}$suf2'"
+            append ${name}_test_deps ${dep}$suf1 ${dep}$suf2
         done
     done
 }
@@ -1514,6 +1514,9 @@ set_ne_test_deps(){
     eval ${1}_le_test_deps="!bigendian"
 }
 
+mxf_d10_test_deps="avfilter"
+seek_lavf_mxf_d10_test_deps="mxf_d10_test"
+
 test_deps _encoder _decoder                                             \
     adpcm_g726=g726                                                     \
     adpcm_ima_qt                                                        \
diff --git a/tests/fate.mak b/tests/fate.mak
index 0e33311..cf6c44e 100644
--- a/tests/fate.mak
+++ b/tests/fate.mak
@@ -128,7 +128,7 @@ FATE_TESTS += fate-id-cin-video
 fate-id-cin-video: CMD = framecrc  -i $(SAMPLES)/idcin/idlog-2MB.cin -pix_fmt rgb24
 FATE_TESTS += fate-idroq-video-dpcm
 fate-idroq-video-dpcm: CMD = framecrc  -i $(SAMPLES)/idroq/idlogo.roq
-FATE_TESTS += fate-idroq-video-encode
+FATE_TESTS-$(CONFIG_AVFILTER) += fate-idroq-video-encode
 fate-idroq-video-encode: CMD = md5  -t 0.2 -f image2 -vcodec pgmyuv -i $(SAMPLES)/ffmpeg-synthetic/vsynth1/%02d.pgm -sws_flags +bitexact -vf pad=512:512:80:112 -f RoQ
 FATE_TESTS += fate-iff-byterun1
 fate-iff-byterun1: CMD = framecrc  -i $(SAMPLES)/iff/ASH.LBM -pix_fmt rgb24