Commit 63dcd16d authored by Mans Rullgard's avatar Mans Rullgard
Browse files

fate: fix dependencies on SAMPLES being set



This allows fate to run without errors with or without SAMPLES
being set.
Signed-off-by: default avatarMans Rullgard <mans@mansr.com>
parent 8ccc1c59
......@@ -80,14 +80,18 @@ FATE = $(FATE_ACODEC) \
$(FATE_SEEK) \
FATE_AVCONV += $(FATE_AVCONV-yes)
FATE-$(CONFIG_AVCONV) += $(FATE_AVCONV)
FATE-$(CONFIG_AVCODEC) += $(FATE_LIBAVCODEC)
FATE-$(CONFIG_AVFILTER) += $(FATE_LAVFI)
FATE_SAMPLES-$(CONFIG_AVCONV) += $(FATE_SAMPLES_AVCONV)
FATE_SAMPLES += $(FATE_SAMPLES-yes)
FATE += $(FATE-yes)
FATE += $(FATE_LIBAVUTIL)
$(FATE_AVCONV): avconv$(EXESUF)
$(FATE_AVCONV) $(FATE_SAMPLES_AVCONV): avconv$(EXESUF)
$(filter-out %-aref,$(FATE_ACODEC)): $(AREF)
$(filter-out %-vref,$(FATE_VSYNTH1)): fate-vsynth1-vref
......@@ -111,14 +115,14 @@ fate-lavfi: $(FATE_LAVFI)
fate-seek: $(FATE_SEEK)
ifdef SAMPLES
FATE += $(FATE_AVCONV)
FATE += $(FATE_SAMPLES)
fate-rsync:
rsync -vaLW rsync://fate-suite.libav.org/fate-suite/ $(SAMPLES)
else
fate-rsync:
@echo "use 'make fate-rsync SAMPLES=/path/to/samples' to sync the fate suite"
$(FATE_TESTS):
@echo "SAMPLES not specified, cannot run FATE"
$(FATE_SAMPLES):
@echo "$@ requires external samples and SAMPLES not specified"; false
endif
FATE_UTILS = base64 tiny_psnr
......
......@@ -71,7 +71,7 @@ FATE_AAC_CT = sbr_bc-ps_i.3gp \
FATE_AAC += $(FATE_AAC_CT:%=fate-aac-ct-%)
FATE_AVCONV += $(FATE_AAC)
FATE_SAMPLES_AVCONV += $(FATE_AAC)
fate-aac: $(FATE_AAC)
$(FATE_AAC): CMP = oneoff
$(FATE_AAC): FUZZ = 2
......@@ -46,5 +46,5 @@ fate-eac3-encode: CMP_TARGET = 514.02
fate-eac3-encode: SIZE_TOLERANCE = 488
fate-eac3-encode: FUZZ = 3
FATE_AVCONV += $(FATE_AC3)
FATE_SAMPLES_AVCONV += $(FATE_AC3)
fate-ac3: $(FATE_AC3)
......@@ -70,5 +70,5 @@ fate-adpcm-xa: CMD = framecrc -i $(SAMPLES)/psx-str/abc000_cut.str -vn
FATE_ADPCM += fate-adpcm_ms-stereo
fate-adpcm_ms-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-L-ms02.mov -f s16le
FATE_AVCONV += $(FATE_ADPCM)
FATE_SAMPLES_AVCONV += $(FATE_ADPCM)
fate-adpcm: $(FATE_ADPCM)
......@@ -7,5 +7,5 @@ endef
$(foreach N,$(ALS_SUITE),$(eval $(call FATE_ALS_SUITE,$(N))))
FATE_AVCONV += $(FATE_ALS)
FATE_SAMPLES_AVCONV += $(FATE_ALS)
fate-als: $(FATE_ALS)
......@@ -46,5 +46,5 @@ fate-amrnb-12k2: CMP = stddev
fate-amrnb-12k2: REF = $(SAMPLES)/amrnb/12.2k.pcm
fate-amrnb-12k2: FUZZ = 1
FATE_AVCONV += $(FATE_AMRNB)
FATE_SAMPLES_AVCONV += $(FATE_AMRNB)
fate-amrnb: $(FATE_AMRNB)
......@@ -58,5 +58,5 @@ fate-amrwb-23k85-2: CMP = stddev
fate-amrwb-23k85-2: REF = $(SAMPLES)/amrwb/deus-23k85.pcm
fate-amrwb-23k85-2: FUZZ = 1
FATE_AVCONV += $(FATE_AMRWB)
FATE_SAMPLES_AVCONV += $(FATE_AMRWB)
fate-amrwb: $(FATE_AMRWB)
......@@ -18,5 +18,5 @@ fate-atrac3-3: CMD = pcm -i $(SAMPLES)/atrac3/mc_sich_at3_132_small.wav
fate-atrac3-3: CMP = oneoff
fate-atrac3-3: REF = $(SAMPLES)/atrac3/mc_sich_at3_132_small.pcm
FATE_AVCONV += $(FATE_ATRAC)
FATE_SAMPLES_AVCONV += $(FATE_ATRAC)
fate-atrac: $(FATE_ATRAC)
......@@ -10,35 +10,35 @@ fate-binkaudio-rdft: CMP = oneoff
fate-binkaudio-rdft: REF = $(SAMPLES)/bink/binkaudio_rdft.pcm
fate-binkaudio-rdft: FUZZ = 2
FATE_AVCONV += $(FATE_BINKAUDIO)
FATE_SAMPLES_AVCONV += $(FATE_BINKAUDIO)
fate-binkaudio: $(FATE_BINKAUDIO)
FATE_AVCONV += fate-bmv-audio
FATE_SAMPLES_AVCONV += fate-bmv-audio
fate-bmv-audio: CMD = framecrc -i $(SAMPLES)/bmv/SURFING-partial.BMV -vn
FATE_AVCONV += fate-delphine-cin-audio
FATE_SAMPLES_AVCONV += fate-delphine-cin-audio
fate-delphine-cin-audio: CMD = framecrc -i $(SAMPLES)/delphine-cin/LOGO-partial.CIN -vn
FATE_AVCONV += fate-dts
FATE_SAMPLES_AVCONV += fate-dts
fate-dts: CMD = pcm -i $(SAMPLES)/dts/dts.ts
fate-dts: CMP = oneoff
fate-dts: REF = $(SAMPLES)/dts/dts.pcm
FATE_AVCONV += fate-imc
FATE_SAMPLES_AVCONV += fate-imc
fate-imc: CMD = pcm -i $(SAMPLES)/imc/imc.avi
fate-imc: CMP = oneoff
fate-imc: REF = $(SAMPLES)/imc/imc.pcm
FATE_AVCONV += fate-nellymoser
FATE_SAMPLES_AVCONV += fate-nellymoser
fate-nellymoser: CMD = pcm -i $(SAMPLES)/nellymoser/nellymoser.flv
fate-nellymoser: CMP = oneoff
fate-nellymoser: REF = $(SAMPLES)/nellymoser/nellymoser.pcm
FATE_AVCONV += fate-sierra-vmd-audio
FATE_SAMPLES_AVCONV += fate-sierra-vmd-audio
fate-sierra-vmd-audio: CMD = framecrc -i $(SAMPLES)/vmd/12.vmd -vn
FATE_AVCONV += fate-smacker-audio
FATE_SAMPLES_AVCONV += fate-smacker-audio
fate-smacker-audio: CMD = framecrc -i $(SAMPLES)/smacker/wetlogo.smk -vn
FATE_AVCONV += fate-ws_snd
FATE_SAMPLES_AVCONV += fate-ws_snd
fate-ws_snd: CMD = md5 -i $(SAMPLES)/vqa/ws_snd.vqa -f s16le
......@@ -37,5 +37,5 @@ fate-bmp-rle4: CMD = framecrc -i $(SAMPLES)/bmp/testcompress4.bmp -pix_fmt rgb24
FATE_BMP += fate-bmp-rle8
fate-bmp-rle8: CMD = framecrc -i $(SAMPLES)/bmp/testcompress8.bmp -pix_fmt rgb24
FATE_AVCONV += $(FATE_BMP)
FATE_SAMPLES_AVCONV += $(FATE_BMP)
fate-bmp: $(FATE_BMP)
......@@ -13,5 +13,5 @@ fate-cdxl-pal8-small: CMD = framecrc -i $(SAMPLES)/cdxl/fruit.cdxl -an -pix_fmt
FATE_CDXL += fate-cdxl-bitline-ham6
fate-cdxl-bitline-ham6: CMD = framecrc -i $(SAMPLES)/cdxl/bitline.cdxl -frames:v 10
FATE_AVCONV += $(FATE_CDXL)
FATE_SAMPLES_AVCONV += $(FATE_CDXL)
fate-cdxl: $(FATE_CDXL)
FATE_AVCONV += fate-adts-demux
FATE_SAMPLES_AVCONV += fate-adts-demux
fate-adts-demux: CMD = crc -i $(SAMPLES)/aac/ct_faac-adts.aac -acodec copy
FATE_AVCONV += fate-aea-demux
FATE_SAMPLES_AVCONV += fate-aea-demux
fate-aea-demux: CMD = crc -i $(SAMPLES)/aea/chirp.aea -acodec copy
FATE_AVCONV += fate-bink-demux
FATE_SAMPLES_AVCONV += fate-bink-demux
fate-bink-demux: CMD = crc -i $(SAMPLES)/bink/Snd0a7d9b58.dee -vn -acodec copy
FATE_AVCONV += fate-caf
FATE_SAMPLES_AVCONV += fate-caf
fate-caf: CMD = crc -i $(SAMPLES)/caf/caf-pcm16.caf -c copy
FATE_AVCONV += fate-cdxl-demux
FATE_SAMPLES_AVCONV += fate-cdxl-demux
fate-cdxl-demux: CMD = framecrc -i $(SAMPLES)/cdxl/mirage.cdxl -vcodec copy -acodec copy
FATE_AVCONV += fate-d-cinema-demux
FATE_SAMPLES_AVCONV += fate-d-cinema-demux
fate-d-cinema-demux: CMD = framecrc -i $(SAMPLES)/d-cinema/THX_Science_FLT_1920-partial.302 -acodec copy
FATE_AVCONV += fate-iv8-demux
FATE_SAMPLES_AVCONV += fate-iv8-demux
fate-iv8-demux: CMD = framecrc -i $(SAMPLES)/iv8/zzz-partial.mpg -vcodec copy
FATE_AVCONV += fate-lmlm4-demux
FATE_SAMPLES_AVCONV += fate-lmlm4-demux
fate-lmlm4-demux: CMD = framecrc -i $(SAMPLES)/lmlm4/LMLM4_CIFat30fps.divx -t 3 -acodec copy -vcodec copy
FATE_AVCONV += fate-maxis-xa
FATE_SAMPLES_AVCONV += fate-maxis-xa
fate-maxis-xa: CMD = framecrc -i $(SAMPLES)/maxis-xa/SC2KBUG.XA -frames:a 30 -c:a copy
FATE_AVCONV += fate-mtv
FATE_SAMPLES_AVCONV += fate-mtv
fate-mtv: CMD = framecrc -i $(SAMPLES)/mtv/comedian_auto-partial.mtv -c copy
FATE_AVCONV += fate-mxf-demux
FATE_SAMPLES_AVCONV += fate-mxf-demux
fate-mxf-demux: CMD = framecrc -i $(SAMPLES)/mxf/C0023S01.mxf -acodec copy -vcodec copy
FATE_AVCONV += fate-nc-demux
FATE_SAMPLES_AVCONV += fate-nc-demux
fate-nc-demux: CMD = framecrc -i $(SAMPLES)/nc-camera/nc-sample-partial -vcodec copy
FATE_AVCONV += fate-nsv-demux
FATE_SAMPLES_AVCONV += fate-nsv-demux
fate-nsv-demux: CMD = framecrc -i $(SAMPLES)/nsv/witchblade-51kbps.nsv -t 6 -vcodec copy -acodec copy
FATE_AVCONV += fate-oma-demux
FATE_SAMPLES_AVCONV += fate-oma-demux
fate-oma-demux: CMD = crc -i $(SAMPLES)/oma/01-Untitled-partial.oma -acodec copy
FATE_AVCONV += fate-psx-str-demux
FATE_SAMPLES_AVCONV += fate-psx-str-demux
fate-psx-str-demux: CMD = framecrc -i $(SAMPLES)/psx-str/descent-partial.str -c copy
FATE_AVCONV += fate-pva-demux
FATE_SAMPLES_AVCONV += fate-pva-demux
fate-pva-demux: CMD = framecrc -idct simple -i $(SAMPLES)/pva/PVA_test-partial.pva -t 0.6 -acodec copy -vn
FATE_AVCONV += fate-qcp-demux
FATE_SAMPLES_AVCONV += fate-qcp-demux
fate-qcp-demux: CMD = crc -i $(SAMPLES)/qcp/0036580847.QCP -acodec copy
FATE_AVCONV += fate-redcode-demux
FATE_SAMPLES_AVCONV += fate-redcode-demux
fate-redcode-demux: CMD = framecrc -i $(SAMPLES)/r3d/4MB-sample.r3d -vcodec copy -acodec copy
FATE_AVCONV += fate-siff
FATE_SAMPLES_AVCONV += fate-siff
fate-siff: CMD = framecrc -i $(SAMPLES)/SIFF/INTRO_B.VB -t 3 -pix_fmt rgb24
FATE_AVCONV += fate-smjpeg-demux
FATE_SAMPLES_AVCONV += fate-smjpeg-demux
fate-smjpeg-demux: CMD = framecrc -i $(SAMPLES)/smjpeg/scenwin.mjpg -c copy
FATE_AVCONV += fate-westwood-aud
FATE_SAMPLES_AVCONV += fate-westwood-aud
fate-westwood-aud: CMD = framecrc -i $(SAMPLES)/westwood-aud/excellent.aud -c copy
FATE_AVCONV += fate-wtv-demux
FATE_SAMPLES_AVCONV += fate-wtv-demux
fate-wtv-demux: CMD = framecrc -i $(SAMPLES)/wtv/law-and-order-partial.wtv -vcodec copy -acodec copy
FATE_AVCONV += fate-xmv-demux
FATE_SAMPLES_AVCONV += fate-xmv-demux
fate-xmv-demux: CMD = framecrc -i $(SAMPLES)/xmv/logos1p.fmv -vcodec copy -acodec copy
FATE_AVCONV += fate-xwma-demux
FATE_SAMPLES_AVCONV += fate-xwma-demux
fate-xwma-demux: CMD = crc -i $(SAMPLES)/xwma/ergon.xwma -acodec copy
......@@ -31,5 +31,5 @@ fate-dfa10: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0009.dfa -pix_fmt rgb2
FATE_DFA += fate-dfa11
fate-dfa11: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0010.dfa -pix_fmt rgb24
FATE_AVCONV += $(FATE_DFA)
FATE_SAMPLES_AVCONV += $(FATE_DFA)
fate-dfa: $(FATE_DFA)
......@@ -10,5 +10,5 @@ fate-dpcm-sierra: CMD = md5 -i $(SAMPLES)/sol/lsl7sample.sol -f s16le
FATE_DPCM += fate-dpcm-xan
fate-dpcm-xan: CMD = md5 -i $(SAMPLES)/wc4-xan/wc4_2.avi -vn -f s16le
FATE_AVCONV += $(FATE_DPCM)
FATE_SAMPLES_AVCONV += $(FATE_DPCM)
fate-dpcm: $(FATE_DPCM)
FATE_AVCONV += fate-ea-cdata
FATE_SAMPLES_AVCONV += fate-ea-cdata
fate-ea-cdata: CMD = md5 -i $(SAMPLES)/ea-cdata/166b084d.46410f77.0009b440.24be960c.cdata -f s16le
FATE_AVCONV += fate-ea-cmv
FATE_SAMPLES_AVCONV += fate-ea-cmv
fate-ea-cmv: CMD = framecrc -i $(SAMPLES)/ea-cmv/TITLE.CMV -pix_fmt rgb24
FATE_AVCONV += fate-ea-tgq
FATE_SAMPLES_AVCONV += fate-ea-tgq
fate-ea-tgq: CMD = framecrc -i $(SAMPLES)/ea-tgq/v27.tgq -an
FATE_AVCONV += fate-ea-tqi
FATE_SAMPLES_AVCONV += fate-ea-tqi
fate-ea-tqi: CMD = framecrc -i $(SAMPLES)/ea-wve/networkBackbone-partial.wve -frames:v 26 -an
FATE_AVCONV += fate-ea-mad
FATE_SAMPLES_AVCONV += fate-ea-mad
fate-ea-mad: CMD = framecrc -i $(SAMPLES)/ea-mad/NFS6LogoE.mad -an
FATE_AVCONV += fate-ea-tgv-1
FATE_SAMPLES_AVCONV += fate-ea-tgv-1
fate-ea-tgv-1: CMD = framecrc -i $(SAMPLES)/ea-tgv/INTRO8K-partial.TGV -pix_fmt rgb24 -an
FATE_AVCONV += fate-ea-tgv-2
FATE_SAMPLES_AVCONV += fate-ea-tgv-2
fate-ea-tgv-2: CMD = framecrc -i $(SAMPLES)/ea-tgv/INTEL_S.TGV -pix_fmt rgb24 -an
......@@ -177,7 +177,7 @@ FATE_H264 := $(FATE_H264:%=fate-h264-conformance-%) \
fate-h264-extreme-plane-pred \
fate-h264-bsf-mp4toannexb \
FATE_AVCONV += $(FATE_H264)
FATE_SAMPLES_AVCONV += $(FATE_H264)
fate-h264: $(FATE_H264)
fate-h264-conformance-aud_mw_e: CMD = framecrc -i $(SAMPLES)/h264-conformance/AUD_MW_E.264
......
FATE_AVCONV += fate-dpx
FATE_SAMPLES_AVCONV += fate-dpx
fate-dpx: CMD = framecrc -i $(SAMPLES)/dpx/lighthouse_rgb48.dpx
FATE_AVCONV += fate-pictor
FATE_SAMPLES_AVCONV += fate-pictor
fate-pictor: CMD = framecrc -i $(SAMPLES)/pictor/MFISH.PIC -pix_fmt rgb24
FATE_AVCONV += fate-ptx
FATE_SAMPLES_AVCONV += fate-ptx
fate-ptx: CMD = framecrc -i $(SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24
FATE_SUNRASTER += fate-sunraster-1bit-raw
......@@ -28,7 +28,7 @@ fate-sunraster-24bit-raw: CMD = framecrc -i $(SAMPLES)/sunraster/lena-24bit-raw.
FATE_SUNRASTER += fate-sunraster-24bit-rle
fate-sunraster-24bit-rle: CMD = framecrc -i $(SAMPLES)/sunraster/lena-24bit-rle.sun
FATE_AVCONV += $(FATE_SUNRASTER)
FATE_SAMPLES_AVCONV += $(FATE_SUNRASTER)
fate-sunraster: $(FATE_SUNRASTER)
FATE_TARGA = CBW8 \
......@@ -45,7 +45,7 @@ FATE_TARGA = CBW8 \
FATE_TARGA := $(FATE_TARGA:%=fate-targa-conformance-%) \
fate-targa-top-to-bottom
FATE_AVCONV += $(FATE_TARGA)
FATE_SAMPLES_AVCONV += $(FATE_TARGA)
fate-targa: $(FATE_TARGA)
fate-targa-conformance-CBW8: CMD = framecrc -i $(SAMPLES)/targa-conformance/CBW8.TGA
......@@ -67,5 +67,5 @@ fate-tiff-fax-g3: CMD = framecrc -i $(SAMPLES)/CCITT_fax/G31D.TIF
FATE_TIFF += fate-tiff-fax-g3s
fate-tiff-fax-g3s: CMD = framecrc -i $(SAMPLES)/CCITT_fax/G31DS.TIF
FATE_AVCONV += $(FATE_TIFF)
FATE_SAMPLES_AVCONV += $(FATE_TIFF)
fate-tiff: $(FATE_TIFF)
......@@ -10,5 +10,5 @@ fate-indeo4: CMD = framecrc -i $(SAMPLES)/iv41/indeo41-partial.avi -an
FATE_INDEO += fate-indeo5
fate-indeo5: CMD = framecrc -i $(SAMPLES)/iv50/Educ_Movie_DeadlyForce.avi -an
FATE_AVCONV += $(FATE_INDEO)
FATE_SAMPLES_AVCONV += $(FATE_INDEO)
fate-indeo: $(FATE_INDEO)
FATE_AVCONV += fate-lossless-alac
FATE_SAMPLES_AVCONV += fate-lossless-alac
fate-lossless-alac: CMD = md5 -i $(SAMPLES)/lossless-audio/inside.m4a -f s16le
FATE_AVCONV += fate-lossless-meridianaudio
FATE_SAMPLES_AVCONV += fate-lossless-meridianaudio
fate-lossless-meridianaudio: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.mlp -f s16le
FATE_AVCONV += fate-lossless-monkeysaudio
FATE_SAMPLES_AVCONV += fate-lossless-monkeysaudio
fate-lossless-monkeysaudio: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.ape -f s16le
FATE_AVCONV += fate-lossless-shorten
FATE_SAMPLES_AVCONV += fate-lossless-shorten
fate-lossless-shorten: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.shn -f s16le
FATE_AVCONV += fate-lossless-tta
FATE_SAMPLES_AVCONV += fate-lossless-tta
fate-lossless-tta: CMD = crc -i $(SAMPLES)/lossless-audio/inside.tta
FATE_AVCONV += fate-lossless-wma
FATE_SAMPLES_AVCONV += fate-lossless-wma
fate-lossless-wma: CMD = md5 -i $(SAMPLES)/lossless-audio/luckynight-partial.wma -f s16le
......@@ -4,20 +4,20 @@ fate-loco-rgb: CMD = framecrc -i $(SAMPLES)/loco/pig-loco-rgb.avi
FATE_LOCO += fate-loco-yuy2
fate-loco-yuy2: CMD = framecrc -i $(SAMPLES)/loco/pig-loco-0.avi
FATE_AVCONV += $(FATE_LOCO)
FATE_SAMPLES_AVCONV += $(FATE_LOCO)
fate-loco: $(FATE_LOCO)
FATE_AVCONV += fate-msrle-8bit
FATE_SAMPLES_AVCONV += fate-msrle-8bit
fate-msrle-8bit: CMD = framecrc -i $(SAMPLES)/msrle/Search-RLE.avi -pix_fmt rgb24
FATE_AVCONV += fate-mszh
FATE_SAMPLES_AVCONV += fate-mszh
fate-mszh: CMD = framecrc -i $(SAMPLES)/lcl/mszh-1frame.avi
FATE_AVCONV += fate-vble
FATE_SAMPLES_AVCONV += fate-vble
fate-vble: CMD = framecrc -i $(SAMPLES)/vble/flowers-partial-2MB.avi
FATE_AVCONV += fate-zlib
FATE_SAMPLES_AVCONV += fate-zlib
fate-zlib: CMD = framecrc -i $(SAMPLES)/lcl/zlib-1frame.avi
FATE_AVCONV += fate-zerocodec
FATE_SAMPLES_AVCONV += fate-zerocodec
fate-zerocodec: CMD = framecrc -i $(SAMPLES)/zerocodec/sample-zeco.avi
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment