[FFmpeg-cvslog] fate: list lavfi tests in a makefile

[Mans Rullgard]

ffmpeg | branch: master | Mans Rullgard <mans at mansr.com> | Tue Oct 16 14:35:05 2012 +0100| [206a070dce5accf7a40bfd3a26568fd7d212a95c] | committer: Mans Rullgard

fate: list lavfi tests in a makefile

Signed-off-by: Mans Rullgard <mans at mansr.com>

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

 configure               |   15 +--------------
 tests/Makefile          |   11 +----------
 tests/fate/avfilter.mak |   24 ++++++++++++++++++++++++
 3 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/configure b/configure
index fca5127..800f22c 100755
--- a/configure
+++ b/configure
@@ -1872,21 +1872,13 @@ ALL_COMPONENTS="
     $PROTOCOL_LIST
 "
 
-find_tests(){
-    map "echo ${2}\${v}_test" $(ls "$source_path"/tests/ref/$1 | grep -v '[^-a-z0-9_]')
-}
-
-LAVFI_TESTS=$(find_tests lavfi)
-
-ALL_TESTS="$LAVFI_TESTS"
-
 for n in $COMPONENT_LIST; do
     v=$(toupper ${n%s})_LIST
     eval enable \$$v
     eval ${n}_if_any="\$$v"
 done
 
-enable $ARCH_EXT_LIST $ALL_TESTS
+enable $ARCH_EXT_LIST
 
 die_unknown(){
     echo "Unknown option \"$1\"."
@@ -3521,7 +3513,6 @@ check_deps $CONFIG_LIST       \
            $CONFIG_EXTRA      \
            $HAVE_LIST         \
            $ALL_COMPONENTS    \
-           $ALL_TESTS         \
 
 ! enabled_any memalign posix_memalign aligned_malloc &&
     enabled_any $need_memalign && enable memalign_hack
@@ -3780,10 +3771,6 @@ print_config CONFIG_ "$config_files" $CONFIG_LIST       \
                                      $CONFIG_EXTRA      \
                                      $ALL_COMPONENTS    \
 
-cat >>config.mak <<EOF
-LAVFI_TESTS=$(print_enabled  -n _test $LAVFI_TESTS)
-EOF
-
 echo "#endif /* LIBAV_CONFIG_H */" >> $TMPH
 
 # Do not overwrite an unchanged config.h to avoid superfluous rebuilds.
diff --git a/tests/Makefile b/tests/Makefile
index 287bbfd..d3b4bcb 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -36,6 +36,7 @@ ENCDEC2 = $(call ALLYES, $(firstword $(1))_ENCODER $(lastword $(1))_DECODER  \
 include $(SRC_PATH)/tests/fate/acodec.mak
 include $(SRC_PATH)/tests/fate/vcodec.mak
 include $(SRC_PATH)/tests/fate/avformat.mak
+include $(SRC_PATH)/tests/fate/avfilter.mak
 include $(SRC_PATH)/tests/fate/seek.mak
 
 include $(SRC_PATH)/tests/fate/aac.mak
@@ -85,10 +86,6 @@ include $(SRC_PATH)/tests/fate/vqf.mak
 include $(SRC_PATH)/tests/fate/wavpack.mak
 include $(SRC_PATH)/tests/fate/wma.mak
 
-FATE_LAVFI   = $(LAVFI_TESTS:%=fate-lavfi-%)
-
-FATE_AVCONV += $(FATE_LAVFI)                                            \
-
 FATE_AVCONV += $(FATE_AVCONV-yes)
 FATE-$(CONFIG_AVCONV) += $(FATE_AVCONV)
 
@@ -103,12 +100,6 @@ FATE += $(FATE_LIBAVUTIL)
 
 $(FATE_AVCONV) $(FATE_SAMPLES_AVCONV): avconv$(EXESUF)
 
-$(FATE_LAVFI): $(VREF) libavfilter/filtfmts-test$(EXESUF)
-
-$(FATE_LAVFI):   CMD = lavfitest
-
-fate-lavfi:  $(FATE_LAVFI)
-
 ifdef SAMPLES
 FATE += $(FATE_SAMPLES)
 fate-rsync:
diff --git a/tests/fate/avfilter.mak b/tests/fate/avfilter.mak
new file mode 100644
index 0000000..de5e9d1
--- /dev/null
+++ b/tests/fate/avfilter.mak
@@ -0,0 +1,24 @@
+FATE_LAVFI = fate-lavfi-crop                                            \
+             fate-lavfi-crop_scale                                      \
+             fate-lavfi-crop_scale_vflip                                \
+             fate-lavfi-crop_vflip                                      \
+             fate-lavfi-null                                            \
+             fate-lavfi-pixdesc                                         \
+             fate-lavfi-pixfmts_copy                                    \
+             fate-lavfi-pixfmts_crop                                    \
+             fate-lavfi-pixfmts_hflip                                   \
+             fate-lavfi-pixfmts_null                                    \
+             fate-lavfi-pixfmts_pad                                     \
+             fate-lavfi-pixfmts_scale                                   \
+             fate-lavfi-pixfmts_vflip                                   \
+             fate-lavfi-scale200                                        \
+             fate-lavfi-scale500                                        \
+             fate-lavfi-vflip                                           \
+             fate-lavfi-vflip_crop                                      \
+             fate-lavfi-vflip_vflip                                     \
+
+$(FATE_LAVFI): $(VREF) libavfilter/filtfmts-test$(EXESUF)
+$(FATE_LAVFI): CMD = lavfitest
+
+FATE_AVCONV += $(FATE_LAVFI)
+fate-lavfi:    $(FATE_LAVFI)