From 33086f92652b5100dbb03bb2a355ebaa575f2876 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 28 Nov 2012 19:33:19 +0100 Subject: fate: image: Add dependencies --- tests/fate/image.mak | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'tests') diff --git a/tests/fate/image.mak b/tests/fate/image.mak index a6768a0be1..1e4bc56407 100644 --- a/tests/fate/image.mak +++ b/tests/fate/image.mak @@ -1,10 +1,10 @@ -FATE_SAMPLES_AVCONV += fate-dpx +FATE_SAMPLES_AVCONV-$(call DEMDEC, IMAGE2, DPX) += fate-dpx fate-dpx: CMD = framecrc -i $(SAMPLES)/dpx/lighthouse_rgb48.dpx -FATE_SAMPLES_AVCONV += fate-pictor +FATE_SAMPLES_AVCONV-$(call DEMDEC, IMAGE2, PICTOR) += fate-pictor fate-pictor: CMD = framecrc -i $(SAMPLES)/pictor/MFISH.PIC -pix_fmt rgb24 -FATE_SAMPLES_AVCONV += fate-ptx +FATE_SAMPLES_AVCONV-$(call DEMDEC, IMAGE2, PTX) += fate-ptx fate-ptx: CMD = framecrc -i $(SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24 FATE_SUNRASTER += fate-sunraster-1bit-raw @@ -28,8 +28,10 @@ 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_SAMPLES_AVCONV += $(FATE_SUNRASTER) -fate-sunraster: $(FATE_SUNRASTER) +FATE_SUNRASTER-$(call DEMDEC, IMAGE2, SUNRAST) += $(FATE_SUNRASTER) + +FATE_SAMPLES_AVCONV += $(FATE_SUNRASTER-yes) +fate-sunraster: $(FATE_SUNRASTER-yes) FATE_TARGA = CBW8 \ CCM8 \ @@ -45,8 +47,10 @@ FATE_TARGA = CBW8 \ FATE_TARGA := $(FATE_TARGA:%=fate-targa-conformance-%) \ fate-targa-top-to-bottom -FATE_SAMPLES_AVCONV += $(FATE_TARGA) -fate-targa: $(FATE_TARGA) +FATE_TARGA-$(call DEMDEC, IMAGE2, TARGA) += $(FATE_TARGA) + +FATE_SAMPLES_AVCONV += $(FATE_TARGA-yes) +fate-targa: $(FATE_TARGA-yes) fate-targa-conformance-CBW8: CMD = framecrc -i $(SAMPLES)/targa-conformance/CBW8.TGA fate-targa-conformance-CCM8: CMD = framecrc -i $(SAMPLES)/targa-conformance/CCM8.TGA -pix_fmt rgba @@ -67,5 +71,7 @@ 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_SAMPLES_AVCONV += $(FATE_TIFF) -fate-tiff: $(FATE_TIFF) +FATE_TIFF-$(call DEMDEC, IMAGE2, TIFF) += $(FATE_TIFF) + +FATE_SAMPLES_AVCONV += $(FATE_TIFF-yes) +fate-tiff: $(FATE_TIFF-yes) -- cgit v1.2.3 From c25fc5c2bb6ae8c93541c9427df3e47206d95152 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 28 Nov 2012 19:34:17 +0100 Subject: fate: dpcm: Add dependencies --- tests/fate/dpcm.mak | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/fate/dpcm.mak b/tests/fate/dpcm.mak index 14e77a20f4..abc25edc9b 100644 --- a/tests/fate/dpcm.mak +++ b/tests/fate/dpcm.mak @@ -1,14 +1,14 @@ -FATE_DPCM += fate-dpcm-idroq +FATE_DPCM-$(call DEMDEC, ROQ, ROQ_DPCM) += fate-dpcm-idroq fate-dpcm-idroq: CMD = framecrc -i $(SAMPLES)/idroq/idlogo.roq -vn -FATE_DPCM += fate-dpcm-interplay +FATE_DPCM-$(call DEMDEC, IPMOVIE, INTERPLAY_DPCM) += fate-dpcm-interplay fate-dpcm-interplay: CMD = framecrc -i $(SAMPLES)/interplay-mve/interplay-logo-2MB.mve -vn -FATE_DPCM += fate-dpcm-sierra +FATE_DPCM-$(call DEMDEC, SOL, SOL_DPCM) += fate-dpcm-sierra fate-dpcm-sierra: CMD = md5 -i $(SAMPLES)/sol/lsl7sample.sol -f s16le -FATE_DPCM += fate-dpcm-xan +FATE_DPCM-$(call DEMDEC, AVI, XAN_DPCM) += fate-dpcm-xan fate-dpcm-xan: CMD = md5 -i $(SAMPLES)/wc4-xan/wc4_2.avi -vn -f s16le -FATE_SAMPLES_AVCONV += $(FATE_DPCM) -fate-dpcm: $(FATE_DPCM) +FATE_SAMPLES_AVCONV += $(FATE_DPCM-yes) +fate-dpcm: $(FATE_DPCM-yes) -- cgit v1.2.3