aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMans Rullgard2011-07-17 11:55:08 +0100
committerMans Rullgard2011-09-27 00:05:51 +0100
commit908f12f342341785bf0458e88a06d97a1af90339 (patch)
tree50071ea0f1d4937d00550c13119e2f98332bcd45
parent96a59cf37b080080b7e45dd57828b40a7a2bbfe7 (diff)
fate: allow testing with libavfilter disabled
This declares dependencies to skip tests using libavfilter when it is disabled. Signed-off-by: Mans Rullgard <mans@mansr.com>
-rwxr-xr-xconfigure5
-rw-r--r--tests/Makefile7
-rw-r--r--tests/fate.mak2
3 files changed, 10 insertions, 4 deletions
diff --git a/configure b/configure
index 8440cab5d0..32f1a26298 100755
--- a/configure
+++ b/configure
@@ -1516,11 +1516,14 @@ 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
}
+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/Makefile b/tests/Makefile
index b511a9a118..c0afffddb3 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -45,9 +45,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_VSYNTH1)): fate-vsynth1-vref
$(filter-out %-vref,$(FATE_VSYNTH2)): fate-vsynth2-vref
@@ -70,7 +73,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/tests/fate.mak b/tests/fate.mak
index a349e5cf23..754896e501 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 -f image2 -vcodec pgmyuv -i $(SAMPLES)/ffmpeg-synthetic/vsynth1/%02d.pgm -sws_flags +bitexact -vf pad=512:512:80:112 -f RoQ -t 0.2
FATE_TESTS += fate-iff-byterun1
fate-iff-byterun1: CMD = framecrc -i $(SAMPLES)/iff/ASH.LBM -pix_fmt rgb24