[FFmpeg-devel] [PATCH] fate: Make ffprobe tests depend on avdevice
James Almer
jamrial at gmail.com
Wed Jul 22 19:54:33 CEST 2015
On 22/07/15 2:26 PM, Michael Niedermayer wrote:
> From: Michael Niedermayer <michael at niedermayer.cc>
>
> The test file they use needs avdevice to be created
>
Is this really needed? We have a fate client compiled with --disable-avfilter
here: http://fate.ffmpeg.org/history.cgi?slot=x86_64-archlinux-gcc-disableavdevice
And it doesn't run these tests.
> Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> ---
> tests/fate/ffprobe.mak | 16 +++++++++-------
> 1 file changed, 9 insertions(+), 7 deletions(-)
>
> diff --git a/tests/fate/ffprobe.mak b/tests/fate/ffprobe.mak
> index cf20185..e9a6a95 100644
> --- a/tests/fate/ffprobe.mak
> +++ b/tests/fate/ffprobe.mak
> @@ -1,33 +1,35 @@
> FFPROBE_TEST_FILE=tests/data/ffprobe-test.nut
> FFPROBE_COMMAND=ffprobe$(EXESUF) -show_streams -show_packets -show_format -show_frames -bitexact $(FFPROBE_TEST_FILE)
>
> -FATE_FFPROBE += fate-ffprobe_compact
> +FATE_FFPROBE-$(CONFIG_AVDEVICE) += fate-ffprobe_compact
> fate-ffprobe_compact: $(FFPROBE_TEST_FILE)
> fate-ffprobe_compact: CMD = run $(FFPROBE_COMMAND) -of compact
>
> -FATE_FFPROBE += fate-ffprobe_csv
> +FATE_FFPROBE-$(CONFIG_AVDEVICE) += fate-ffprobe_csv
> fate-ffprobe_csv: $(FFPROBE_TEST_FILE)
> fate-ffprobe_csv: CMD = run $(FFPROBE_COMMAND) -of csv
>
> -FATE_FFPROBE += fate-ffprobe_default
> +FATE_FFPROBE-$(CONFIG_AVDEVICE) += fate-ffprobe_default
> fate-ffprobe_default: $(FFPROBE_TEST_FILE)
> fate-ffprobe_default: CMD = run $(FFPROBE_COMMAND) -of default
>
> -FATE_FFPROBE += fate-ffprobe_flat
> +FATE_FFPROBE-$(CONFIG_AVDEVICE) += fate-ffprobe_flat
> fate-ffprobe_flat: $(FFPROBE_TEST_FILE)
> fate-ffprobe_flat: CMD = run $(FFPROBE_COMMAND) -of flat
>
> -FATE_FFPROBE += fate-ffprobe_ini
> +FATE_FFPROBE-$(CONFIG_AVDEVICE) += fate-ffprobe_ini
> fate-ffprobe_ini: $(FFPROBE_TEST_FILE)
> fate-ffprobe_ini: CMD = run $(FFPROBE_COMMAND) -of ini
>
> -FATE_FFPROBE += fate-ffprobe_json
> +FATE_FFPROBE-$(CONFIG_AVDEVICE) += fate-ffprobe_json
> fate-ffprobe_json: $(FFPROBE_TEST_FILE)
> fate-ffprobe_json: CMD = run $(FFPROBE_COMMAND) -of json
>
> -FATE_FFPROBE += fate-ffprobe_xml
> +FATE_FFPROBE-$(CONFIG_AVDEVICE) += fate-ffprobe_xml
> fate-ffprobe_xml: $(FFPROBE_TEST_FILE)
> fate-ffprobe_xml: CMD = run $(FFPROBE_COMMAND) -of xml
>
> +FATE_FFPROBE += $(FATE_FFPROBE-yes)
> +
> fate-ffprobe: $(FATE_FFPROBE)
>
>
More information about the ffmpeg-devel
mailing list