fate: Add dependencies for Vorbis, ProRes, QTRLE, utvideo tests

[ffmpeg] / tests / fate / image.mak

diff --git a/tests/fate/image.mak b/tests/fate/image.mak
index 9714cd8c5a602dd60149fb34868250f19574440c..a6768a0be1d1adea274751c62ff46ef3ef5dfb86 100644 (file)
--- a/tests/fate/image.mak
+++ b/tests/fate/image.mak
@@ -1,36 +1,36 @@
-FATE_TESTS += fate-dpx
+FATE_SAMPLES_AVCONV += fate-dpx
 fate-dpx: CMD = framecrc -i $(SAMPLES)/dpx/lighthouse_rgb48.dpx
 
-FATE_TESTS += fate-fax-g3
-fate-fax-g3: CMD = framecrc -i $(SAMPLES)/CCITT_fax/G31D.TIF
-
-FATE_TESTS += fate-fax-g3s
-fate-fax-g3s: CMD = framecrc -i $(SAMPLES)/CCITT_fax/G31DS.TIF
-
-FATE_TESTS += fate-pictor
+FATE_SAMPLES_AVCONV += fate-pictor
 fate-pictor: CMD = framecrc -i $(SAMPLES)/pictor/MFISH.PIC -pix_fmt rgb24
 
-FATE_TESTS += fate-ptx
+FATE_SAMPLES_AVCONV += fate-ptx
 fate-ptx: CMD = framecrc -i $(SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24
 
-FATE_TESTS += fate-sunraster-1bit-raw
+FATE_SUNRASTER += fate-sunraster-1bit-raw
 fate-sunraster-1bit-raw: CMD = framecrc -i $(SAMPLES)/sunraster/lena-1bit-raw.sun
 
-FATE_TESTS += fate-sunraster-1bit-rle
+FATE_SUNRASTER += fate-sunraster-1bit-rle
 fate-sunraster-1bit-rle: CMD = framecrc -i $(SAMPLES)/sunraster/lena-1bit-rle.sun
 
-FATE_TESTS += fate-sunraster-8bit-raw
+FATE_SUNRASTER += fate-sunraster-8bit-raw
 fate-sunraster-8bit-raw: CMD = framecrc -i $(SAMPLES)/sunraster/lena-8bit-raw.sun -pix_fmt rgb24
 
-FATE_TESTS += fate-sunraster-8bit-rle
+FATE_SUNRASTER += fate-sunraster-8bit_gray-raw
+fate-sunraster-8bit_gray-raw: CMD = framecrc -i $(SAMPLES)/sunraster/gray.ras
+
+FATE_SUNRASTER += fate-sunraster-8bit-rle
 fate-sunraster-8bit-rle: CMD = framecrc -i $(SAMPLES)/sunraster/lena-8bit-rle.sun -pix_fmt rgb24
 
-FATE_TESTS += fate-sunraster-24bit-raw
+FATE_SUNRASTER += fate-sunraster-24bit-raw
 fate-sunraster-24bit-raw: CMD = framecrc -i $(SAMPLES)/sunraster/lena-24bit-raw.sun
 
-FATE_TESTS += fate-sunraster-24bit-rle
+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_TARGA = CBW8       \
              CCM8       \
              CTC16      \
@@ -45,7 +45,7 @@ FATE_TARGA = CBW8       \
 FATE_TARGA := $(FATE_TARGA:%=fate-targa-conformance-%)  \
               fate-targa-top-to-bottom
 
-FATE_TESTS += $(FATE_TARGA)
+FATE_SAMPLES_AVCONV += $(FATE_TARGA)
 fate-targa: $(FATE_TARGA)
 
 fate-targa-conformance-CBW8:  CMD = framecrc -i $(SAMPLES)/targa-conformance/CBW8.TGA
@@ -60,3 +60,12 @@ fate-targa-conformance-UTC24: CMD = framecrc -i $(SAMPLES)/targa-conformance/UTC
 fate-targa-conformance-UTC32: CMD = framecrc -i $(SAMPLES)/targa-conformance/UTC32.TGA -pix_fmt bgra
 
 fate-targa-top-to-bottom: CMD = framecrc -i $(SAMPLES)/targa/lena-top-to-bottom.tga
+
+FATE_TIFF += fate-tiff-fax-g3
+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)