summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile14
-rwxr-xr-xconfigure5
2 files changed, 4 insertions, 15 deletions
diff --git a/Makefile b/Makefile
index 8b5639ebb1..052a058d33 100644
--- a/Makefile
+++ b/Makefile
@@ -176,20 +176,6 @@ fulltest test: codectest lavftest seektest
FFSERVER_REFFILE = $(SRC_PATH)/tests/ffserver.regression.ref
SEEK_REFFILE = $(SRC_PATH)/tests/seek.regression.ref
-LAVFI_TESTS = \
- crop \
- crop_scale \
- crop_scale_vflip \
- crop_vflip \
- null \
- scale200 \
- scale500 \
- vflip \
- vflip_crop \
- vflip_vflip \
- lavfi_pixdesc \
-# lavfi_pix_fmts \
-
ACODEC_TESTS := $(addprefix regtest-, $(ACODEC_TESTS) $(ACODEC_TESTS-yes))
VCODEC_TESTS := $(addprefix regtest-, $(VCODEC_TESTS) $(VCODEC_TESTS-yes))
LAVF_TESTS := $(addprefix regtest-, $(LAVF_TESTS) $(LAVF_TESTS-yes))
diff --git a/configure b/configure
index 0513751136..58cc566c67 100755
--- a/configure
+++ b/configure
@@ -1616,6 +1616,7 @@ find_tests(){
ACODEC_TESTS=$(find_tests acodec)
VCODEC_TESTS=$(find_tests vsynth1)
LAVF_TESTS=$(find_tests lavf)
+LAVFI_TESTS=$(find_tests lavfi)
pcm_test_deps=$(map 'echo ${v%_*}_decoder $v' $(filter pcm_* $ENCODER_LIST))
@@ -1625,7 +1626,7 @@ for n in $COMPONENT_LIST; do
eval ${n}_if_any="\$$v"
done
-enable $ARCH_EXT_LIST $ACODEC_TESTS $VCODEC_TESTS $LAVF_TESTS
+enable $ARCH_EXT_LIST $ACODEC_TESTS $VCODEC_TESTS $LAVF_TESTS $LAVFI_TESTS
die_unknown(){
echo "Unknown option \"$1\"."
@@ -2853,6 +2854,7 @@ check_deps $CONFIG_LIST \
$ACODEC_TESTS \
$VCODEC_TESTS \
$LAVF_TESTS \
+ $LAVFI_TESTS \
enabled asm || { arch=c; disable $ARCH_LIST $ARCH_EXT_LIST; }
@@ -3127,6 +3129,7 @@ cat >>config.mak <<EOF
ACODEC_TESTS=$(print_enabled -n _test $ACODEC_TESTS)
VCODEC_TESTS=$(print_enabled -n _test $VCODEC_TESTS)
LAVF_TESTS=$(print_enabled -n _test $LAVF_TESTS)
+LAVFI_TESTS=$(print_enabled -n _test $LAVFI_TESTS)
EOF
echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH