fate: add generic rules for most of the remaining tests/fate/*.mak files.

11 files changed, 197 insertions, 166 deletions

diff --git a/tests/fate/audio.mak b/tests/fate/audio.mak
index 9c9a6ff1d2..182dafdc76 100644
--- a/tests/fate/audio.mak
+++ b/tests/fate/audio.mak
@@ -1,30 +1,32 @@
-FATE_TESTS += fate-binkaudio-dct
+FATE_AUDIO += fate-binkaudio-dct
 fate-binkaudio-dct: CMD = pcm -i $(SAMPLES)/bink/binkaudio_dct.bik
 fate-binkaudio-dct: CMP = oneoff
 fate-binkaudio-dct: REF = $(SAMPLES)/bink/binkaudio_dct.pcm
 fate-binkaudio-dct: FUZZ = 2
 
-FATE_TESTS += fate-binkaudio-rdft
+FATE_AUDIO += fate-binkaudio-rdft
 fate-binkaudio-rdft: CMD = pcm -i $(SAMPLES)/bink/binkaudio_rdft.bik
 fate-binkaudio-rdft: CMP = oneoff
 fate-binkaudio-rdft: REF = $(SAMPLES)/bink/binkaudio_rdft.pcm
 fate-binkaudio-rdft: FUZZ = 2
 
-FATE_TESTS += fate-dts
+FATE_AUDIO += fate-dts
 fate-dts: CMD = pcm -i $(SAMPLES)/dts/dts.ts
 fate-dts: CMP = oneoff
 fate-dts: REF = $(SAMPLES)/dts/dts.pcm
 
-FATE_TESTS += fate-imc
+FATE_AUDIO += fate-imc
 fate-imc: CMD = pcm -i $(SAMPLES)/imc/imc.avi
 fate-imc: CMP = oneoff
 fate-imc: REF = $(SAMPLES)/imc/imc.pcm
 
-FATE_TESTS += fate-nellymoser
+FATE_AUDIO += fate-nellymoser
 fate-nellymoser: CMD = pcm -i $(SAMPLES)/nellymoser/nellymoser.flv
 fate-nellymoser: CMP = oneoff
 fate-nellymoser: REF = $(SAMPLES)/nellymoser/nellymoser.pcm
 
-FATE_TESTS += fate-ws_snd
+FATE_AUDIO += fate-ws_snd
 fate-ws_snd: CMD = md5 -i $(SAMPLES)/vqa/ws_snd.vqa -f s16le
 
+FATE_TESTS += $(FATE_AUDIO)
+fate-audio: $(FATE_AUDIO)
diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak
index 1e7d781e3c..269c155557 100644
--- a/tests/fate/demux.mak
+++ b/tests/fate/demux.mak
@@ -1,86 +1,89 @@
-FATE_TESTS += fate-adts-demux
+FATE_DEMUX += fate-adts-demux
 fate-adts-demux: CMD = crc -i $(SAMPLES)/aac/ct_faac-adts.aac -acodec copy
 
-FATE_TESTS += fate-aea-demux
+FATE_DEMUX += fate-aea-demux
 fate-aea-demux: CMD = crc -i $(SAMPLES)/aea/chirp.aea -acodec copy
 
-FATE_TESTS += fate-bink-demux
+FATE_DEMUX += fate-bink-demux
 fate-bink-demux: CMD = crc -i $(SAMPLES)/bink/Snd0a7d9b58.dee -vn -acodec copy
 
-FATE_TESTS += fate-bink-demux-video
+FATE_DEMUX += fate-bink-demux-video
 fate-bink-demux-video: CMD = framecrc -i $(SAMPLES)/bink/hol2br.bik
 
-FATE_TESTS += fate-bmv
+FATE_DEMUX += fate-bmv
 fate-bmv: CMD = framecrc -i $(SAMPLES)/bmv/SURFING-partial.BMV -pix_fmt rgb24
 
-FATE_TESTS += fate-caf
+FATE_DEMUX += fate-caf
 fate-caf: CMD = crc -i $(SAMPLES)/caf/caf-pcm16.caf
 
-FATE_TESTS += fate-cryo-apc
+FATE_DEMUX += fate-cryo-apc
 fate-cryo-apc: CMD = md5 -i $(SAMPLES)/cryo-apc/cine007.APC -f s16le
 
-FATE_TESTS += fate-d-cinema-demux
+FATE_DEMUX += fate-d-cinema-demux
 fate-d-cinema-demux: CMD = framecrc -i $(SAMPLES)/d-cinema/THX_Science_FLT_1920-partial.302 -acodec copy -pix_fmt rgb24
 
-FATE_TESTS += fate-funcom-iss
+FATE_DEMUX += fate-funcom-iss
 fate-funcom-iss: CMD = md5 -i $(SAMPLES)/funcom-iss/0004010100.iss -f s16le
 
-FATE_TESTS += fate-interplay-mve-16bit
+FATE_DEMUX += fate-interplay-mve-16bit
 fate-interplay-mve-16bit: CMD = framecrc -i $(SAMPLES)/interplay-mve/descent3-level5-16bit-partial.mve -pix_fmt rgb24
 
-FATE_TESTS += fate-interplay-mve-8bit
+FATE_DEMUX += fate-interplay-mve-8bit
 fate-interplay-mve-8bit: CMD = framecrc -i $(SAMPLES)/interplay-mve/interplay-logo-2MB.mve -pix_fmt rgb24
 
-FATE_TESTS += fate-iv8-demux
+FATE_DEMUX += fate-iv8-demux
 fate-iv8-demux: CMD = framecrc -i $(SAMPLES)/iv8/zzz-partial.mpg -vsync 0 -vcodec copy
 
-FATE_TESTS += fate-lmlm4-demux
+FATE_DEMUX += fate-lmlm4-demux
 fate-lmlm4-demux: CMD = framecrc -i $(SAMPLES)/lmlm4/LMLM4_CIFat30fps.divx -t 3 -acodec copy -vcodec copy
 
-FATE_TESTS += fate-maxis-xa
+FATE_DEMUX += fate-maxis-xa
 fate-maxis-xa: CMD = md5 -i $(SAMPLES)/maxis-xa/SC2KBUG.XA -f s16le
 
-FATE_TESTS += fate-mtv
+FATE_DEMUX += fate-mtv
 fate-mtv: CMD = framecrc -i $(SAMPLES)/mtv/comedian_auto-partial.mtv -acodec copy -pix_fmt rgb24
 
-FATE_TESTS += fate-mxf-demux
+FATE_DEMUX += fate-mxf-demux
 fate-mxf-demux: CMD = framecrc -i $(SAMPLES)/mxf/C0023S01.mxf -acodec copy -vcodec copy
 
-FATE_TESTS += fate-nc-demux
+FATE_DEMUX += fate-nc-demux
 fate-nc-demux: CMD = framecrc -i $(SAMPLES)/nc-camera/nc-sample-partial -vcodec copy
 
-FATE_TESTS += fate-nsv-demux
+FATE_DEMUX += fate-nsv-demux
 fate-nsv-demux: CMD = framecrc -i $(SAMPLES)/nsv/witchblade-51kbps.nsv -t 6 -vcodec copy -acodec copy
 
-FATE_TESTS += fate-oma-demux
+FATE_DEMUX += fate-oma-demux
 fate-oma-demux: CMD = crc -i $(SAMPLES)/oma/01-Untitled-partial.oma -acodec copy
 
-FATE_TESTS += fate-psx-str
+FATE_DEMUX += fate-psx-str
 fate-psx-str: CMD = framecrc -i $(SAMPLES)/psx-str/descent-partial.str
 
-FATE_TESTS += fate-psx-str-v3-mdec
+FATE_DEMUX += fate-psx-str-v3-mdec
 fate-psx-str-v3-mdec: CMD = framecrc -i $(SAMPLES)/psx-str/abc000_cut.str -an
 
-FATE_TESTS += fate-pva-demux
+FATE_DEMUX += fate-pva-demux
 fate-pva-demux: CMD = framecrc -idct simple -i $(SAMPLES)/pva/PVA_test-partial.pva -t 0.6 -acodec copy
 
-FATE_TESTS += fate-qcp-demux
+FATE_DEMUX += fate-qcp-demux
 fate-qcp-demux: CMD = crc -i $(SAMPLES)/qcp/0036580847.QCP -acodec copy
 
-FATE_TESTS += fate-redcode-demux
+FATE_DEMUX += fate-redcode-demux
 fate-redcode-demux: CMD = framecrc -i $(SAMPLES)/r3d/4MB-sample.r3d -vcodec copy -acodec copy
 
-FATE_TESTS += fate-sierra-audio
+FATE_DEMUX += fate-sierra-audio
 fate-sierra-audio: CMD = md5 -i $(SAMPLES)/sol/lsl7sample.sol -f s16le
 
-FATE_TESTS += fate-sierra-vmd
+FATE_DEMUX += fate-sierra-vmd
 fate-sierra-vmd: CMD = framecrc -i $(SAMPLES)/vmd/12.vmd -vsync 0 -pix_fmt rgb24
 
-FATE_TESTS += fate-siff
+FATE_DEMUX += fate-siff
 fate-siff: CMD = framecrc -i $(SAMPLES)/SIFF/INTRO_B.VB -t 3 -pix_fmt rgb24
 
-FATE_TESTS += fate-westwood-aud
+FATE_DEMUX += fate-westwood-aud
 fate-westwood-aud: CMD = md5 -i $(SAMPLES)/westwood-aud/excellent.aud -f s16le
 
-FATE_TESTS += fate-xmv-demux
+FATE_DEMUX += fate-xmv-demux
 fate-xmv-demux: CMD = framecrc -i $(SAMPLES)/xmv/logos1p.fmv -vcodec copy -acodec copy
+
+FATE_TESTS += $(FATE_DEMUX)
+fate-demux: $(FATE_DEMUX)
diff --git a/tests/fate/dpcm.mak b/tests/fate/dpcm.mak
index 606a5246f0..119bdadc82 100644
--- a/tests/fate/dpcm.mak
+++ b/tests/fate/dpcm.mak
@@ -1,42 +1,44 @@
-FATE_TESTS += fate-adpcm-ea-r2
+FATE_DPCM += fate-adpcm-ea-r2
 fate-adpcm-ea-r2: CMD = crc -i $(SAMPLES)/ea-mpc/THX_logo.mpc -vn
 
-FATE_TESTS += fate-adpcm-ea-r3
+FATE_DPCM += fate-adpcm-ea-r3
 fate-adpcm-ea-r3: CMD = crc -i $(SAMPLES)/ea-vp6/THX_logo.vp6 -vn
 
-FATE_TESTS += fate-creative-adpcm
+FATE_DPCM += fate-creative-adpcm
 fate-creative-adpcm: CMD = md5 -i $(SAMPLES)/creative/intro-partial.wav -f s16le
 
-FATE_TESTS += fate-creative-adpcm-8-2bit
+FATE_DPCM += fate-creative-adpcm-8-2bit
 fate-creative-adpcm-8-2bit: CMD = md5 -i $(SAMPLES)/creative/BBC_2BIT.VOC -f s16le
 
-FATE_TESTS += fate-creative-adpcm-8-2.6bit
+FATE_DPCM += fate-creative-adpcm-8-2.6bit
 fate-creative-adpcm-8-2.6bit: CMD = md5 -i $(SAMPLES)/creative/BBC_3BIT.VOC -f s16le
 
-FATE_TESTS += fate-creative-adpcm-8-4bit
+FATE_DPCM += fate-creative-adpcm-8-4bit
 fate-creative-adpcm-8-4bit: CMD = md5 -i $(SAMPLES)/creative/BBC_4BIT.VOC -f s16le
 
-FATE_TESTS += fate-ea-mad-adpcm-ea-r1
+FATE_DPCM += fate-ea-mad-adpcm-ea-r1
 fate-ea-mad-adpcm-ea-r1: CMD = framecrc -i $(SAMPLES)/ea-mad/NFS6LogoE.mad
 
-FATE_TESTS += fate-ea-tqi-adpcm
+FATE_DPCM += fate-ea-tqi-adpcm
 fate-ea-tqi-adpcm: CMD = framecrc -i $(SAMPLES)/ea-wve/networkBackbone-partial.wve -frames:v 26
 
-FATE_TESTS += fate-idroq-video-dpcm
+FATE_DPCM += fate-idroq-video-dpcm
 fate-idroq-video-dpcm: CMD = framecrc -i $(SAMPLES)/idroq/idlogo.roq
 
-FATE_TESTS += fate-psx-str-v3-adpcm_xa
+FATE_DPCM += fate-psx-str-v3-adpcm_xa
 fate-psx-str-v3-adpcm_xa: CMD = framecrc -i $(SAMPLES)/psx-str/abc000_cut.str -vn
 
-FATE_TESTS += fate-qt-msadpcm-stereo
+FATE_DPCM += fate-qt-msadpcm-stereo
 fate-qt-msadpcm-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-L-ms02.mov -f s16le
 
-FATE_TESTS += fate-qt-msimaadpcm-stereo
+FATE_DPCM += fate-qt-msimaadpcm-stereo
 fate-qt-msimaadpcm-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-L-ms11.mov -f s16le
 
-FATE_TESTS += fate-thp-mjpeg-adpcm
+FATE_DPCM += fate-thp-mjpeg-adpcm
 fate-thp-mjpeg-adpcm: CMD = framecrc -idct simple -i $(SAMPLES)/thp/pikmin2-opening1-partial.thp
 
-FATE_TESTS += fate-dpcm-xan
+FATE_DPCM += fate-dpcm-xan
 fate-dpcm-xan: CMD = md5 -i $(SAMPLES)/wc4-xan/wc4_2.avi -vn -f s16le
 
+FATE_TESTS += $(FATE_DPCM)
+fate-dpcm: $(FATE_DPCM)
diff --git a/tests/fate/ea.mak b/tests/fate/ea.mak
index 1e628f4e27..c1e7f9482c 100644
--- a/tests/fate/ea.mak
+++ b/tests/fate/ea.mak
@@ -1,17 +1,20 @@
-FATE_TESTS += fate-ea-cdata
+FATE_EA += fate-ea-cdata
 fate-ea-cdata: CMD = md5 -i $(SAMPLES)/ea-cdata/166b084d.46410f77.0009b440.24be960c.cdata -f s16le
 
-FATE_TESTS += fate-ea-cmv
+FATE_EA += fate-ea-cmv
 fate-ea-cmv: CMD = framecrc -i $(SAMPLES)/ea-cmv/TITLE.CMV -vsync 0 -pix_fmt rgb24
 
-FATE_TESTS += fate-ea-dct
+FATE_EA += fate-ea-dct
 fate-ea-dct: CMD = framecrc -idct simple -i $(SAMPLES)/ea-dct/NFS2Esprit-partial.dct
 
-FATE_TESTS += fate-ea-tgq
+FATE_EA += fate-ea-tgq
 fate-ea-tgq: CMD = framecrc -i $(SAMPLES)/ea-tgq/v27.tgq -an
 
-FATE_TESTS += fate-ea-tgv-ima-ea-eacs
+FATE_EA += fate-ea-tgv-ima-ea-eacs
 fate-ea-tgv-ima-ea-eacs: CMD = framecrc -i $(SAMPLES)/ea-tgv/INTRO8K-partial.TGV -pix_fmt rgb24
 
-FATE_TESTS += fate-ea-tgv-ima-ea-sead
+FATE_EA += fate-ea-tgv-ima-ea-sead
 fate-ea-tgv-ima-ea-sead: CMD = framecrc -i $(SAMPLES)/ea-tgv/INTEL_S.TGV -pix_fmt rgb24
+
+FATE_TESTS += $(FATE_EA)
+fate-ea: $(FATE_EA)
diff --git a/tests/fate/microsoft.mak b/tests/fate/microsoft.mak
index 200763b12a..6d3ed1c700 100644
--- a/tests/fate/microsoft.mak
+++ b/tests/fate/microsoft.mak
@@ -1,30 +1,33 @@
-FATE_TESTS += fate-msmpeg4v1
+FATE_MICROSOFT += fate-msmpeg4v1
 fate-msmpeg4v1: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/msmpeg4v1/mpg4.avi -an
 
-FATE_TESTS += fate-msvideo1-16bit
+FATE_MICROSOFT += fate-msvideo1-16bit
 fate-msvideo1-16bit: CMD = framecrc -i $(SAMPLES)/cram/clock-cram16.avi -pix_fmt rgb24
 
-FATE_TESTS += fate-msvideo1-8bit
+FATE_MICROSOFT += fate-msvideo1-8bit
 fate-msvideo1-8bit: CMD = framecrc -i $(SAMPLES)/cram/skating.avi -t 1 -pix_fmt rgb24
 
-FATE_TESTS += fate-wmv8-drm
+FATE_MICROSOFT += fate-wmv8-drm
 # discard last packet to avoid fails due to overread of VC-1 decoder
 fate-wmv8-drm: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(SAMPLES)/wmv8/wmv_drm.wmv -an -vframes 162
 
-FATE_TESTS += fate-wmv8-drm-nodec
+FATE_MICROSOFT += fate-wmv8-drm-nodec
 fate-wmv8-drm-nodec: CMD = framecrc -cryptokey 137381538c84c068111902a59c5cf6c340247c39 -i $(SAMPLES)/wmv8/wmv_drm.wmv -acodec copy -vcodec copy
 
-FATE_TESTS += fate-wmv8-x8intra
+FATE_MICROSOFT += fate-wmv8-x8intra
 fate-wmv8-x8intra: CMD = framecrc -i $(SAMPLES)/wmv8/wmv8_x8intra.wmv -an
 
-FATE_TESTS += fate-vc1
+FATE_MICROSOFT += fate-vc1
 fate-vc1: CMD = framecrc -i $(SAMPLES)/vc1/SA00040.vc1
 
-FATE_TESTS += fate-vc1_sa00050
+FATE_MICROSOFT += fate-vc1_sa00050
 fate-vc1_sa00050: CMD = framecrc -i $(SAMPLES)/vc1/SA00050.vc1
 
-FATE_TESTS += fate-vc1_sa10091
+FATE_MICROSOFT += fate-vc1_sa10091
 fate-vc1_sa10091: CMD = framecrc -i $(SAMPLES)/vc1/SA10091.vc1
 
-FATE_TESTS += fate-vc1_sa20021
+FATE_MICROSOFT += fate-vc1_sa20021
 fate-vc1_sa20021: CMD = framecrc -i $(SAMPLES)/vc1/SA20021.vc1
+
+FATE_TESTS += $(FATE_MICROSOFT)
+fate-microsoft: $(FATE_MICROSOFT)
diff --git a/tests/fate/mpc.mak b/tests/fate/mpc.mak
index a5f1b30a23..2b263ce6be 100644
--- a/tests/fate/mpc.mak
+++ b/tests/fate/mpc.mak
@@ -1,11 +1,14 @@
-FATE_TESTS += fate-mpc7-demux
+FATE_MPC += fate-mpc7-demux
 fate-mpc7-demux: CMD = crc -i $(SAMPLES)/musepack/inside-mp7.mpc -acodec copy
 
-FATE_TESTS += fate-mpc8-demux
+FATE_MPC += fate-mpc8-demux
 fate-mpc8-demux: CMD = crc -i $(SAMPLES)/musepack/inside-mp8.mpc -acodec copy
 
-FATE_TESTS += fate-musepack7
+FATE_MPC += fate-musepack7
 fate-musepack7: CMD = pcm -i $(SAMPLES)/musepack/inside-mp7.mpc
 fate-musepack7: CMP = oneoff
 fate-musepack7: REF = $(SAMPLES)/musepack/inside-mp7.pcm
 fate-musepack7: FUZZ = 1
+
+FATE_TESTS += $(FATE_MPC)
+fate-mpc: $(FATE_MPC)
diff --git a/tests/fate/pcm.mak b/tests/fate/pcm.mak
index 2c4b8e417c..41b4583c85 100644
--- a/tests/fate/pcm.mak
+++ b/tests/fate/pcm.mak
@@ -1,32 +1,35 @@
-FATE_TESTS += fate-duck-dk3
+FATE_PCM += fate-duck-dk3
 fate-duck-dk3: CMD = md5 -i $(SAMPLES)/duck/sop-audio-only.avi -f s16le
 
-FATE_TESTS += fate-duck-dk4
+FATE_PCM += fate-duck-dk4
 fate-duck-dk4: CMD = md5 -i $(SAMPLES)/duck/salsa-audio-only.avi -f s16le
 
-FATE_TESTS += fate-ea-mad-pcm-planar
+FATE_PCM += fate-ea-mad-pcm-planar
 fate-ea-mad-pcm-planar: CMD = framecrc -i $(SAMPLES)/ea-mad/xeasport.mad
 
-FATE_TESTS += fate-film-cvid-pcm-stereo-8bit
+FATE_PCM += fate-film-cvid-pcm-stereo-8bit
 fate-film-cvid-pcm-stereo-8bit: CMD = framecrc -i $(SAMPLES)/film/logo-capcom.cpk
 
-FATE_TESTS += fate-iff-pcm
+FATE_PCM += fate-iff-pcm
 fate-iff-pcm: CMD = md5 -i $(SAMPLES)/iff/Bells -f s16le
 
-FATE_TESTS += fate-pcm_dvd
+FATE_PCM += fate-pcm_dvd
 fate-pcm_dvd: CMD = framecrc -i $(SAMPLES)/pcm-dvd/coolitnow-partial.vob -vn
 
-FATE_TESTS += fate-qt-rawpcm-8bit-mono-unsigned
+FATE_PCM += fate-qt-rawpcm-8bit-mono-unsigned
 fate-qt-rawpcm-8bit-mono-unsigned: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-1-8-raw.mov -f s16le
 
-FATE_TESTS += fate-qt-rawpcm-8bit-stereo-unsigned
+FATE_PCM += fate-qt-rawpcm-8bit-stereo-unsigned
 fate-qt-rawpcm-8bit-stereo-unsigned: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-8-raw.mov -f s16le
 
-FATE_TESTS += fate-qt-rawpcm-16bit-stereo-signed-be
+FATE_PCM += fate-qt-rawpcm-16bit-stereo-signed-be
 fate-qt-rawpcm-16bit-stereo-signed-be: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-B-twos.mov -f s16le
 
-FATE_TESTS += fate-qt-rawpcm-16bit-stereo-signed-le
+FATE_PCM += fate-qt-rawpcm-16bit-stereo-signed-le
 fate-qt-rawpcm-16bit-stereo-signed-le: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-L-sowt.mov -f s16le
 
-FATE_TESTS += fate-w64
+FATE_PCM += fate-w64
 fate-w64: CMD = crc -i $(SAMPLES)/w64/w64-pcm16.w64
+
+FATE_TESTS += $(FATE_PCM)
+fate-pcm: $(FATE_PCM)
diff --git a/tests/fate/qt.mak b/tests/fate/qt.mak
index 9b25306ad0..0afa401d7c 100644
--- a/tests/fate/qt.mak
+++ b/tests/fate/qt.mak
@@ -1,50 +1,53 @@
-FATE_TESTS += fate-8bps
+FATE_QT += fate-8bps
 fate-8bps: CMD = framecrc -i $(SAMPLES)/8bps/full9iron-partial.mov -pix_fmt rgb24
 
-FATE_TESTS += fate-qdm2
+FATE_QT += fate-qdm2
 fate-qdm2: CMD = pcm -i $(SAMPLES)/qt-surge-suite/surge-2-16-B-QDM2.mov
 fate-qdm2: CMP = oneoff
 fate-qdm2: REF = $(SAMPLES)/qt-surge-suite/surge-2-16-B-QDM2.pcm
 fate-qdm2: FUZZ = 2
 
-FATE_TESTS += fate-qt-alaw-mono
+FATE_QT += fate-qt-alaw-mono
 fate-qt-alaw-mono: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-1-16-B-alaw.mov -f s16le
 
-FATE_TESTS += fate-qt-alaw-stereo
+FATE_QT += fate-qt-alaw-stereo
 fate-qt-alaw-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-B-alaw.mov -f s16le
 
-FATE_TESTS += fate-qt-ima4-mono
+FATE_QT += fate-qt-ima4-mono
 fate-qt-ima4-mono: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-1-16-B-ima4.mov -f s16le
 
-FATE_TESTS += fate-qt-ima4-stereo
+FATE_QT += fate-qt-ima4-stereo
 fate-qt-ima4-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-B-ima4.mov -f s16le
 
-FATE_TESTS += fate-qt-mac3-mono
+FATE_QT += fate-qt-mac3-mono
 fate-qt-mac3-mono: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-1-8-MAC3.mov -f s16le
 
-FATE_TESTS += fate-qt-mac3-stereo
+FATE_QT += fate-qt-mac3-stereo
 fate-qt-mac3-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-8-MAC3.mov -f s16le
 
-FATE_TESTS += fate-qt-mac6-mono
+FATE_QT += fate-qt-mac6-mono
 fate-qt-mac6-mono: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-1-8-MAC6.mov -f s16le
 
-FATE_TESTS += fate-qt-mac6-stereo
+FATE_QT += fate-qt-mac6-stereo
 fate-qt-mac6-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-8-MAC6.mov -f s16le
 
-FATE_TESTS += fate-qt-ulaw-mono
+FATE_QT += fate-qt-ulaw-mono
 fate-qt-ulaw-mono: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-1-16-B-ulaw.mov -f s16le
 
-FATE_TESTS += fate-qt-ulaw-stereo
+FATE_QT += fate-qt-ulaw-stereo
 fate-qt-ulaw-stereo: CMD = md5 -i $(SAMPLES)/qt-surge-suite/surge-2-16-B-ulaw.mov -f s16le
 
-FATE_TESTS += fate-quickdraw
+FATE_QT += fate-quickdraw
 fate-quickdraw: CMD = framecrc -i $(SAMPLES)/quickdraw/Airplane.mov -pix_fmt rgb24
 
-FATE_TESTS += fate-rpza
+FATE_QT += fate-rpza
 fate-rpza: CMD = framecrc -i $(SAMPLES)/rpza/rpza2.mov -t 2 -pix_fmt rgb24
 
-FATE_TESTS += fate-svq1
+FATE_QT += fate-svq1
 fate-svq1: CMD = framecrc -i $(SAMPLES)/svq1/marymary-shackles.mov -an -t 10
 
-FATE_TESTS += fate-svq3
+FATE_QT += fate-svq3
 fate-svq3: CMD = framecrc -i $(SAMPLES)/svq3/Vertical400kbit.sorenson3.mov -t 6 -an
+
+FATE_TESTS += $(FATE_QT)
+fate-qt: $(FATE_QT)
diff --git a/tests/fate/video.mak b/tests/fate/video.mak
index 01dd306d1a..59317381c7 100644
--- a/tests/fate/video.mak
+++ b/tests/fate/video.mak
@@ -1,189 +1,192 @@
-FATE_TESTS += fate-4xm-1
+FATE_VIDEO += fate-4xm-1
 fate-4xm-1: CMD = framecrc -i $(SAMPLES)/4xm/version1.4xm -pix_fmt rgb24 -an
 
-FATE_TESTS += fate-4xm-2
+FATE_VIDEO += fate-4xm-2
 fate-4xm-2: CMD = framecrc -i $(SAMPLES)/4xm/version2.4xm -pix_fmt rgb24 -an
 
-FATE_TESTS += fate-aasc
+FATE_VIDEO += fate-aasc
 fate-aasc: CMD = framecrc -i $(SAMPLES)/aasc/AASC-1.5MB.AVI -pix_fmt rgb24
 
-FATE_TESTS += fate-alg-mm
+FATE_VIDEO += fate-alg-mm
 fate-alg-mm: CMD = framecrc -i $(SAMPLES)/alg-mm/ibmlogo.mm -an -pix_fmt rgb24
 
-FATE_TESTS += fate-amv
+FATE_VIDEO += fate-amv
 fate-amv: CMD = framecrc -idct simple -i $(SAMPLES)/amv/MTV_high_res_320x240_sample_Penguin_Joke_MTV_from_WMV.amv -t 10
 
-FATE_TESTS += fate-ansi
+FATE_VIDEO += fate-ansi
 fate-ansi: CMD = framecrc -chars_per_frame 44100 -i $(SAMPLES)/ansi/TRE-IOM5.ANS -pix_fmt rgb24
 
-FATE_TESTS += fate-armovie-escape124
+FATE_VIDEO += fate-armovie-escape124
 fate-armovie-escape124: CMD = framecrc -i $(SAMPLES)/rpl/ESCAPE.RPL -pix_fmt rgb24
 
-FATE_TESTS += fate-auravision
+FATE_VIDEO += fate-auravision
 fate-auravision: CMD = framecrc -i $(SAMPLES)/auravision/SOUVIDEO.AVI -an
 
-FATE_TESTS += fate-auravision-v2
+FATE_VIDEO += fate-auravision-v2
 fate-auravision-v2: CMD = framecrc -i $(SAMPLES)/auravision/salma-hayek-in-ugly-betty-partial-avi -an
 
-FATE_TESTS += fate-bethsoft-vid
+FATE_VIDEO += fate-bethsoft-vid
 fate-bethsoft-vid: CMD = framecrc -i $(SAMPLES)/bethsoft-vid/ANIM0001.VID -vsync 0 -t 5 -pix_fmt rgb24
 
-FATE_TESTS += fate-bfi
+FATE_VIDEO += fate-bfi
 fate-bfi: CMD = framecrc -i $(SAMPLES)/bfi/2287.bfi -pix_fmt rgb24
 
-FATE_TESTS += fate-cdgraphics
+FATE_VIDEO += fate-cdgraphics
 fate-cdgraphics: CMD = framecrc -i $(SAMPLES)/cdgraphics/BrotherJohn.cdg -pix_fmt rgb24 -t 1
 
-FATE_TESTS += fate-cljr
+FATE_VIDEO += fate-cljr
 fate-cljr: CMD = framecrc -i $(SAMPLES)/cljr/testcljr-partial.avi
 
-FATE_TESTS += fate-corepng
+FATE_VIDEO += fate-corepng
 fate-corepng: CMD = framecrc -i $(SAMPLES)/png1/corepng-partial.avi
 
-FATE_TESTS += fate-creatureshock-avs
+FATE_VIDEO += fate-creatureshock-avs
 fate-creatureshock-avs: CMD = framecrc -i $(SAMPLES)/creatureshock-avs/OUTATIME.AVS -pix_fmt rgb24
 
-FATE_TESTS += fate-cvid
+FATE_VIDEO += fate-cvid
 fate-cvid: CMD = framecrc -i $(SAMPLES)/cvid/laracroft-cinepak-partial.avi -an
 
-FATE_TESTS += fate-cvid-palette
+FATE_VIDEO += fate-cvid-palette
 fate-cvid-palette: CMD = framecrc -i $(SAMPLES)/cvid/catfight-cvid-pal8-partial.mov -pix_fmt rgb24 -an
 
-FATE_TESTS += fate-cyberia-c93
+FATE_VIDEO += fate-cyberia-c93
 fate-cyberia-c93: CMD = framecrc -i $(SAMPLES)/cyberia-c93/intro1.c93 -t 3 -pix_fmt rgb24
 
-FATE_TESTS += fate-cyuv
+FATE_VIDEO += fate-cyuv
 fate-cyuv: CMD = framecrc -i $(SAMPLES)/cyuv/cyuv.avi
 
-FATE_TESTS += fate-delphine-cin
+FATE_VIDEO += fate-delphine-cin
 fate-delphine-cin: CMD = framecrc -i $(SAMPLES)/delphine-cin/LOGO-partial.CIN -pix_fmt rgb24 -vsync 0
 
-FATE_TESTS += fate-deluxepaint-anm
+FATE_VIDEO += fate-deluxepaint-anm
 fate-deluxepaint-anm: CMD = framecrc -i $(SAMPLES)/deluxepaint-anm/INTRO1.ANM -pix_fmt rgb24
 
-FATE_TESTS += fate-duck-tm2
+FATE_VIDEO += fate-duck-tm2
 fate-duck-tm2: CMD = framecrc -i $(SAMPLES)/duck/tm20.avi
 
-FATE_TESTS += fate-dxa-scummvm
+FATE_VIDEO += fate-dxa-scummvm
 fate-dxa-scummvm: CMD = framecrc -i $(SAMPLES)/dxa/scummvm.dxa -pix_fmt rgb24
 
-FATE_TESTS += fate-feeble-dxa
+FATE_VIDEO += fate-feeble-dxa
 fate-feeble-dxa: CMD = framecrc -i $(SAMPLES)/dxa/meetsquid.dxa -t 2 -pix_fmt rgb24
 
-FATE_TESTS += fate-flic-af11-palette-change
+FATE_VIDEO += fate-flic-af11-palette-change
 fate-flic-af11-palette-change: CMD = framecrc -i $(SAMPLES)/fli/fli-engines.fli -t 3.3 -pix_fmt rgb24
 
-FATE_TESTS += fate-flic-af12
+FATE_VIDEO += fate-flic-af12
 fate-flic-af12: CMD = framecrc -i $(SAMPLES)/fli/jj00c2.fli -pix_fmt rgb24
 
-FATE_TESTS += fate-flic-magiccarpet
+FATE_VIDEO += fate-flic-magiccarpet
 fate-flic-magiccarpet: CMD = framecrc -i $(SAMPLES)/fli/intel.dat -pix_fmt rgb24
 
-FATE_TESTS += fate-frwu
+FATE_VIDEO += fate-frwu
 fate-frwu: CMD = framecrc -i $(SAMPLES)/frwu/frwu.avi
 
-FATE_TESTS += fate-id-cin-video
+FATE_VIDEO += fate-id-cin-video
 fate-id-cin-video: CMD = framecrc -i $(SAMPLES)/idcin/idlog-2MB.cin -pix_fmt rgb24
 
-FATE_TESTS-$(CONFIG_AVFILTER) += fate-idroq-video-encode
+FATE_VIDEO-$(CONFIG_AVFILTER) += fate-idroq-video-encode
 fate-idroq-video-encode: CMD = md5 -f image2 -vcodec pgmyuv -i $(SAMPLES)/ffmpeg-synthetic/vsynth1/%02d.pgm -sws_flags +bitexact -vf pad=512:512:80:112 -f RoQ -t 0.2
 
-FATE_TESTS += fate-iff-byterun1
+FATE_VIDEO += fate-iff-byterun1
 fate-iff-byterun1: CMD = framecrc -i $(SAMPLES)/iff/ASH.LBM -pix_fmt rgb24
 
-FATE_TESTS += fate-iff-fibonacci
+FATE_VIDEO += fate-iff-fibonacci
 fate-iff-fibonacci: CMD = md5 -i $(SAMPLES)/iff/dasboot-in-compressed -f s16le
 
-FATE_TESTS += fate-iff-ilbm
+FATE_VIDEO += fate-iff-ilbm
 fate-iff-ilbm: CMD = framecrc -i $(SAMPLES)/iff/lms-matriks.ilbm -pix_fmt rgb24
 
-FATE_TESTS += fate-kmvc
+FATE_VIDEO += fate-kmvc
 fate-kmvc: CMD = framecrc -i $(SAMPLES)/KMVC/LOGO1.AVI -an -t 3 -pix_fmt rgb24
 
-FATE_TESTS += fate-mimic
+FATE_VIDEO += fate-mimic
 fate-mimic: CMD = framecrc -idct simple -i $(SAMPLES)/mimic/mimic2-womanloveffmpeg.cam -vsync 0
 
-FATE_TESTS += fate-mjpegb
+FATE_VIDEO += fate-mjpegb
 fate-mjpegb: CMD = framecrc -idct simple -flags +bitexact -i $(SAMPLES)/mjpegb/mjpegb_part.mov -an
 
-FATE_TESTS += fate-motionpixels
+FATE_VIDEO += fate-motionpixels
 fate-motionpixels: CMD = framecrc -i $(SAMPLES)/motion-pixels/INTRO-partial.MVI -an -pix_fmt rgb24 -vframes 111
 
-FATE_TESTS += fate-mpeg2-field-enc
+FATE_VIDEO += fate-mpeg2-field-enc
 fate-mpeg2-field-enc: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -an
 
-FATE_TESTS += fate-nuv
+FATE_VIDEO += fate-nuv
 fate-nuv: CMD = framecrc -idct simple -i $(SAMPLES)/nuv/Today.nuv -vsync 0
 
-FATE_TESTS += fate-qpeg
+FATE_VIDEO += fate-qpeg
 fate-qpeg: CMD = framecrc -i $(SAMPLES)/qpeg/Clock.avi -an -pix_fmt rgb24
 
-FATE_TESTS += fate-r210
+FATE_VIDEO += fate-r210
 fate-r210: CMD = framecrc -i $(SAMPLES)/r210/r210.avi -pix_fmt rgb48le
 
-FATE_TESTS += fate-rl2
+FATE_VIDEO += fate-rl2
 fate-rl2: CMD = framecrc -i $(SAMPLES)/rl2/Z4915300.RL2 -pix_fmt rgb24 -an -vsync 0
 
-FATE_TESTS += fate-smacker
+FATE_VIDEO += fate-smacker
 fate-smacker: CMD = framecrc -i $(SAMPLES)/smacker/wetlogo.smk -pix_fmt rgb24
 
-FATE_TESTS += fate-smc
+FATE_VIDEO += fate-smc
 fate-smc: CMD = framecrc -i $(SAMPLES)/smc/cass_schi.qt -vsync 0 -pix_fmt rgb24
 
-FATE_TESTS += fate-sp5x
+FATE_VIDEO += fate-sp5x
 fate-sp5x: CMD = framecrc -idct simple -i $(SAMPLES)/sp5x/sp5x_problem.avi
 
-FATE_TESTS += fate-sub-srt
+FATE_VIDEO += fate-sub-srt
 fate-sub-srt: CMD = md5 -i $(SAMPLES)/sub/SubRip_capability_tester.srt -f ass
 
-FATE_TESTS += fate-tiertex-seq
+FATE_VIDEO += fate-tiertex-seq
 fate-tiertex-seq: CMD = framecrc -i $(SAMPLES)/tiertex-seq/Gameover.seq -pix_fmt rgb24
 
-FATE_TESTS += fate-tmv
+FATE_VIDEO += fate-tmv
 fate-tmv: CMD = framecrc -i $(SAMPLES)/tmv/pop-partial.tmv -pix_fmt rgb24
 
-FATE_TESTS += fate-truemotion1-15
+FATE_VIDEO += fate-truemotion1-15
 fate-truemotion1-15: CMD = framecrc -i $(SAMPLES)/duck/phant2-940.duk -pix_fmt rgb24
 
-FATE_TESTS += fate-truemotion1-24
+FATE_VIDEO += fate-truemotion1-24
 fate-truemotion1-24: CMD = framecrc -i $(SAMPLES)/duck/sonic3dblast_intro-partial.avi -pix_fmt rgb24
 
-FATE_TESTS += fate-txd-16bpp
+FATE_VIDEO += fate-txd-16bpp
 fate-txd-16bpp: CMD = framecrc -i $(SAMPLES)/txd/misc.txd -pix_fmt bgra -an
 
-FATE_TESTS += fate-txd-pal8
+FATE_VIDEO += fate-txd-pal8
 fate-txd-pal8: CMD = framecrc -i $(SAMPLES)/txd/outro.txd -pix_fmt rgb24 -an
 
-FATE_TESTS += fate-ulti
+FATE_VIDEO += fate-ulti
 fate-ulti: CMD = framecrc -i $(SAMPLES)/ulti/hit12w.avi -an
 
-FATE_TESTS += fate-v210
+FATE_VIDEO += fate-v210
 fate-v210: CMD = framecrc -i $(SAMPLES)/v210/v210_720p-partial.avi -pix_fmt yuv422p16be -an
 
-FATE_TESTS += fate-v410dec
+FATE_VIDEO += fate-v410dec
 fate-v410dec: CMD = framecrc -i $(SAMPLES)/v410/lenav410.mov -pix_fmt yuv444p10le
 
-FATE_TESTS += fate-v410enc
+FATE_VIDEO += fate-v410enc
 fate-v410enc: tests/vsynth1/00.pgm
 fate-v410enc: CMD = md5 -f image2 -vcodec pgmyuv -i $(TARGET_PATH)/tests/vsynth1/%02d.pgm -flags +bitexact -vcodec v410 -f avi
 
-FATE_TESTS += fate-vcr1
+FATE_VIDEO += fate-vcr1
 fate-vcr1: CMD = framecrc -i $(SAMPLES)/vcr1/VCR1test.avi -an
 
-FATE_TESTS += fate-video-xl
+FATE_VIDEO += fate-video-xl
 fate-video-xl: CMD = framecrc -i $(SAMPLES)/vixl/pig-vixl.avi
 
-FATE_TESTS += fate-vqa-cc
+FATE_VIDEO += fate-vqa-cc
 fate-vqa-cc: CMD = framecrc -i $(SAMPLES)/vqa/cc-demo1-partial.vqa -pix_fmt rgb24
 
-FATE_TESTS += fate-wc3movie-xan
+FATE_VIDEO += fate-wc3movie-xan
 fate-wc3movie-xan: CMD = framecrc -i $(SAMPLES)/wc3movie/SC_32-part.MVE -pix_fmt rgb24
 
-FATE_TESTS += fate-wnv1
+FATE_VIDEO += fate-wnv1
 fate-wnv1: CMD = framecrc -i $(SAMPLES)/wnv1/wnv1-codec.avi -an
 
-FATE_TESTS += fate-yop
+FATE_VIDEO += fate-yop
 fate-yop: CMD = framecrc -i $(SAMPLES)/yop/test1.yop -pix_fmt rgb24 -an
 
-FATE_TESTS += fate-xxan-wc4
+FATE_VIDEO += fate-xxan-wc4
 fate-xxan-wc4: CMD = framecrc -i $(SAMPLES)/wc4-xan/wc4trailer-partial.avi -an
+
+FATE_TESTS += $(FATE_VIDEO)
+fate-video: $(FATE_VIDEO)
diff --git a/tests/fate/voice.mak b/tests/fate/voice.mak
index 51cc2ae37e..3dd9697bcf 100644
--- a/tests/fate/voice.mak
+++ b/tests/fate/voice.mak
@@ -1,22 +1,25 @@
-FATE_TESTS += fate-g722dec-1
+FATE_VOICE += fate-g722dec-1
 fate-g722dec-1: CMD = framecrc -i $(SAMPLES)/g722/conf-adminmenu-162.g722
 
-FATE_TESTS += fate-g722enc
+FATE_VOICE += fate-g722enc
 fate-g722enc: tests/data/asynth-16000-1.sw
 fate-g722enc: CMD = md5 -ar 16000 -ac 1 -f s16le -i $(TARGET_PATH)/tests/data/asynth-16000-1.sw -acodec g722 -ac 1 -f g722
 
-FATE_TESTS += fate-gsm
+FATE_VOICE += fate-gsm
 fate-gsm: CMD = framecrc -i $(SAMPLES)/gsm/sample-gsm-8000.mov -t 10
 
-FATE_TESTS += fate-gsm-ms
+FATE_VOICE += fate-gsm-ms
 fate-gsm-ms: CMD = framecrc -i $(SAMPLES)/gsm/ciao.wav
 
-FATE_TESTS += fate-qcelp
+FATE_VOICE += fate-qcelp
 fate-qcelp: CMD = pcm -i $(SAMPLES)/qcp/0036580847.QCP
 fate-qcelp: CMP = oneoff
 fate-qcelp: REF = $(SAMPLES)/qcp/0036580847.pcm
 
-FATE_TESTS += fate-truespeech
+FATE_VOICE += fate-truespeech
 fate-truespeech: CMD = pcm -i $(SAMPLES)/truespeech/a6.wav
 fate-truespeech: CMP = oneoff
 fate-truespeech: REF = $(SAMPLES)/truespeech/a6.pcm
+
+FATE_TESTS += $(FATE_VOICE)
+fate-voice: $(FATE_VOICE)
diff --git a/tests/fate/vqf.mak b/tests/fate/vqf.mak
index 846b1404bb..04c531de0f 100644
--- a/tests/fate/vqf.mak
+++ b/tests/fate/vqf.mak
@@ -1,7 +1,10 @@
-FATE_TESTS += fate-twinvq
+FATE_VQF += fate-twinvq
 fate-twinvq: CMD = pcm -i $(SAMPLES)/vqf/achterba.vqf
 fate-twinvq: CMP = oneoff
 fate-twinvq: REF = $(SAMPLES)/vqf/achterba.pcm
 
-FATE_TESTS += fate-vqf-demux
+FATE_VQF += fate-vqf-demux
 fate-vqf-demux: CMD = md5 -i $(SAMPLES)/vqf/achterba.vqf -acodec copy -f framecrc
+
+FATE_TESTS += $(FATE_VQF)
+fate-vqf: $(FATE_VQF)