Browse Source

fate: Handle lavf-fate tests in a makefile

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n1.1
jamal Michael Niedermayer 12 years ago
parent
commit
9434ead2f3
3 changed files with 12 additions and 23 deletions
  1. +1
    -14
      configure
  2. +1
    -8
      tests/Makefile
  3. +10
    -1
      tests/fate/avformat.mak

+ 1
- 14
configure View File

@@ -2127,21 +2127,13 @@ ALL_COMPONENTS="
$PROTOCOL_LIST
"

find_tests(){
map "echo ${2}\${v}_test" $(ls "$source_path"/tests/ref/$1 | grep -v '[^-a-z0-9_]')
}

LAVF_FATE_TESTS=$(find_tests lavf-fate)

ALL_TESTS="$LAVF_FATE_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\"."
@@ -3950,7 +3942,6 @@ check_deps $CONFIG_LIST \
$CONFIG_EXTRA \
$HAVE_LIST \
$ALL_COMPONENTS \
$ALL_TESTS \


if test $target_os = "haiku"; then
@@ -4306,10 +4297,6 @@ print_config CONFIG_ "$config_files" $CONFIG_LIST \
$CONFIG_EXTRA \
$ALL_COMPONENTS \

cat >>config.mak <<EOF
LAVF_FATE_TESTS=$(print_enabled -n _test $LAVF_FATE_TESTS)
EOF

echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH
echo "endif # FFMPEG_CONFIG_MAK" >> config.mak



+ 1
- 8
tests/Makefile View File

@@ -113,8 +113,6 @@ include $(SRC_PATH)/tests/fate/vqf.mak
include $(SRC_PATH)/tests/fate/wavpack.mak
include $(SRC_PATH)/tests/fate/wma.mak

FATE_LAVF_FATE = $(LAVF_FATE_TESTS:%=fate-lavf-fate-%)

FATE_FFMPEG += $(FATE_FFMPEG-yes) $(FATE_AVCONV) $(FATE_AVCONV-yes)
FATE-$(CONFIG_FFMPEG) += $(FATE_FFMPEG)
FATE-$(CONFIG_FFPROBE) += $(FATE_FFPROBE)
@@ -129,16 +127,11 @@ FATE_EXTERN += $(FATE_EXTERN-yes)
FATE += $(FATE-yes)
FATE += $(FATE_LIBAVUTIL)

$(FATE_FFMPEG) $(FATE_LAVF_FATE) $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG): ffmpeg$(EXESUF)
$(FATE_FFMPEG) $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG): ffmpeg$(EXESUF)

$(FATE_FFPROBE): ffprobe$(EXESUF)

$(FATE_LAVF_FATE): CMD = lavffatetest

fate-lavf-fate: $(FATE_LAVF_FATE)

ifdef SAMPLES
FATE += $(FATE_LAVF_FATE)
FATE += $(FATE_FULL) $(FATE_FULL-yes)
FATE += $(FATE_EXTERN)
fate-rsync:


+ 10
- 1
tests/fate/avformat.mak View File

@@ -21,7 +21,6 @@ FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF) += mxf
FATE_LAVF-$(call ENCDEC2, MPEG2VIDEO, PCM_S16LE, MXF_D10 MXF) += mxf_d10
FATE_LAVF-$(call ENCDEC2, MPEG4, MP2, NUT) += nut
FATE_LAVF-$(call ENCDEC, FLAC, OGG) += ogg
FATE_LAVF-$(call ENCDEC, VP3, OGG) += ogg_vp3
FATE_LAVF-$(call ENCDEC, PAM, IMAGE2) += pam
FATE_LAVF-$(call ENCDEC, PBM, IMAGE2PIPE) += pbmpipe
FATE_LAVF-$(call ENCDEC, PCX, IMAGE2) += pcx
@@ -55,3 +54,13 @@ $(FATE_LAVF): CMD = lavftest

FATE_AVCONV += $(FATE_LAVF)
fate-lavf: $(FATE_LAVF)

FATE_LAVF_FATE-$(call ALLYES, MATROSKA_DEMUXER OGG_MUXER) += ogg_vp3
FATE_LAVF_FATE-$(call ALLYES, MOV_DEMUXER LATM_MUXER) += latm
FATE_LAVF_FATE-$(call ALLYES, MP3_DEMUXER MP3_MUXER) += mp3

FATE_LAVF_FATE += $(FATE_LAVF_FATE-yes:%=fate-lavf-fate-%)
$(FATE_LAVF_FATE): CMD = lavffatetest

FATE_SAMPLES_FFMPEG += $(FATE_LAVF_FATE)
fate-lavf-fate: $(FATE_LAVF_FATE)

Loading…
Cancel
Save