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

14 files changed, 149 insertions, 107 deletions

diff --git a/tests/fate/ac3.mak b/tests/fate/ac3.mak
index 255479ad43..83b13b6323 100644
--- a/tests/fate/ac3.mak
+++ b/tests/fate/ac3.mak
@@ -1,29 +1,32 @@
-FATE_TESTS += fate-ac3-2.0
+FATE_AC3 += fate-ac3-2.0
 fate-ac3-2.0: CMD = pcm -i $(SAMPLES)/ac3/monsters_inc_2.0_192_small.ac3
 fate-ac3-2.0: CMP = oneoff
 fate-ac3-2.0: REF = $(SAMPLES)/ac3/monsters_inc_2.0_192_small.pcm
 
-FATE_TESTS += fate-ac3-5.1
+FATE_AC3 += fate-ac3-5.1
 fate-ac3-5.1: CMD = pcm -i $(SAMPLES)/ac3/monsters_inc_5.1_448_small.ac3
 fate-ac3-5.1: CMP = oneoff
 fate-ac3-5.1: REF = $(SAMPLES)/ac3/monsters_inc_5.1_448_small.pcm
 
-FATE_TESTS += fate-eac3-1
+FATE_AC3 += fate-eac3-1
 fate-eac3-1: CMD = pcm -i $(SAMPLES)/eac3/csi_miami_5.1_256_spx_small.eac3
 fate-eac3-1: CMP = oneoff
 fate-eac3-1: REF = $(SAMPLES)/eac3/csi_miami_5.1_256_spx_small.pcm
 
-FATE_TESTS += fate-eac3-2
+FATE_AC3 += fate-eac3-2
 fate-eac3-2: CMD = pcm -i $(SAMPLES)/eac3/csi_miami_stereo_128_spx_small.eac3
 fate-eac3-2: CMP = oneoff
 fate-eac3-2: REF = $(SAMPLES)/eac3/csi_miami_stereo_128_spx_small.pcm
 
-FATE_TESTS += fate-eac3-3
+FATE_AC3 += fate-eac3-3
 fate-eac3-3: CMD = pcm -i $(SAMPLES)/eac3/matrix2_commentary1_stereo_192_small.eac3
 fate-eac3-3: CMP = oneoff
 fate-eac3-3: REF = $(SAMPLES)/eac3/matrix2_commentary1_stereo_192_small.pcm
 
-FATE_TESTS += fate-eac3-4
+FATE_AC3 += fate-eac3-4
 fate-eac3-4: CMD = pcm -i $(SAMPLES)/eac3/serenity_english_5.1_1536_small.eac3
 fate-eac3-4: CMP = oneoff
 fate-eac3-4: REF = $(SAMPLES)/eac3/serenity_english_5.1_1536_small.pcm
+
+FATE_TESTS += $(FATE_AC3)
+fate-ac3: $(FATE_AC3)
diff --git a/tests/fate/amrnb.mak b/tests/fate/amrnb.mak
index e633fec65b..3545ba86fb 100644
--- a/tests/fate/amrnb.mak
+++ b/tests/fate/amrnb.mak
@@ -1,47 +1,50 @@
-FATE_TESTS += fate-amrnb-4k75
+FATE_AMRNB += fate-amrnb-4k75
 fate-amrnb-4k75: CMD = pcm -i $(SAMPLES)/amrnb/4.75k.amr
 fate-amrnb-4k75: CMP = stddev
 fate-amrnb-4k75: REF = $(SAMPLES)/amrnb/4.75k.pcm
 fate-amrnb-4k75: FUZZ = 1
 
-FATE_TESTS += fate-amrnb-5k15
+FATE_AMRNB += fate-amrnb-5k15
 fate-amrnb-5k15: CMD = pcm -i $(SAMPLES)/amrnb/5.15k.amr
 fate-amrnb-5k15: CMP = stddev
 fate-amrnb-5k15: REF = $(SAMPLES)/amrnb/5.15k.pcm
 fate-amrnb-5k15: FUZZ = 1
 
-FATE_TESTS += fate-amrnb-5k9
+FATE_AMRNB += fate-amrnb-5k9
 fate-amrnb-5k9: CMD = pcm -i $(SAMPLES)/amrnb/5.9k.amr
 fate-amrnb-5k9: CMP = stddev
 fate-amrnb-5k9: REF = $(SAMPLES)/amrnb/5.9k.pcm
 fate-amrnb-5k9: FUZZ = 1
 
-FATE_TESTS += fate-amrnb-6k7
+FATE_AMRNB += fate-amrnb-6k7
 fate-amrnb-6k7: CMD = pcm -i $(SAMPLES)/amrnb/6.7k.amr
 fate-amrnb-6k7: CMP = stddev
 fate-amrnb-6k7: REF = $(SAMPLES)/amrnb/6.7k.pcm
 fate-amrnb-6k7: FUZZ = 1
 
-FATE_TESTS += fate-amrnb-7k4
+FATE_AMRNB += fate-amrnb-7k4
 fate-amrnb-7k4: CMD = pcm -i $(SAMPLES)/amrnb/7.4k.amr
 fate-amrnb-7k4: CMP = stddev
 fate-amrnb-7k4: REF = $(SAMPLES)/amrnb/7.4k.pcm
 fate-amrnb-7k4: FUZZ = 1
 
-FATE_TESTS += fate-amrnb-7k95
+FATE_AMRNB += fate-amrnb-7k95
 fate-amrnb-7k95: CMD = pcm -i $(SAMPLES)/amrnb/7.95k.amr
 fate-amrnb-7k95: CMP = stddev
 fate-amrnb-7k95: REF = $(SAMPLES)/amrnb/7.95k.pcm
 fate-amrnb-7k95: FUZZ = 1
 
-FATE_TESTS += fate-amrnb-10k2
+FATE_AMRNB += fate-amrnb-10k2
 fate-amrnb-10k2: CMD = pcm -i $(SAMPLES)/amrnb/10.2k.amr
 fate-amrnb-10k2: CMP = stddev
 fate-amrnb-10k2: REF = $(SAMPLES)/amrnb/10.2k.pcm
 fate-amrnb-10k2: FUZZ = 1
 
-FATE_TESTS += fate-amrnb-12k2
+FATE_AMRNB += fate-amrnb-12k2
 fate-amrnb-12k2: CMD = pcm -i $(SAMPLES)/amrnb/12.2k.amr
 fate-amrnb-12k2: CMP = stddev
 fate-amrnb-12k2: REF = $(SAMPLES)/amrnb/12.2k.pcm
 fate-amrnb-12k2: FUZZ = 1
+
+FATE_TESTS += $(FATE_AMRNB)
+fate-amrnb: $(FATE_AMRNB)
diff --git a/tests/fate/amrwb.mak b/tests/fate/amrwb.mak
index d3931c7ccb..8fc7928995 100644
--- a/tests/fate/amrwb.mak
+++ b/tests/fate/amrwb.mak
@@ -1,59 +1,62 @@
-FATE_TESTS += fate-amrwb-6k60
+FATE_AMRWB += fate-amrwb-6k60
 fate-amrwb-6k60: CMD = pcm -i $(SAMPLES)/amrwb/seed-6k60.awb
 fate-amrwb-6k60: CMP = stddev
 fate-amrwb-6k60: REF = $(SAMPLES)/amrwb/seed-6k60.pcm
 fate-amrwb-6k60: FUZZ = 1
 
-FATE_TESTS += fate-amrwb-8k85
+FATE_AMRWB += fate-amrwb-8k85
 fate-amrwb-8k85: CMD = pcm -i $(SAMPLES)/amrwb/seed-8k85.awb
 fate-amrwb-8k85: CMP = stddev
 fate-amrwb-8k85: REF = $(SAMPLES)/amrwb/seed-8k85.pcm
 fate-amrwb-8k85: FUZZ = 1
 
-FATE_TESTS += fate-amrwb-12k65
+FATE_AMRWB += fate-amrwb-12k65
 fate-amrwb-12k65: CMD = pcm -i $(SAMPLES)/amrwb/seed-12k65.awb
 fate-amrwb-12k65: CMP = stddev
 fate-amrwb-12k65: REF = $(SAMPLES)/amrwb/seed-12k65.pcm
 fate-amrwb-12k65: FUZZ = 1
 
-FATE_TESTS += fate-amrwb-14k25
+FATE_AMRWB += fate-amrwb-14k25
 fate-amrwb-14k25: CMD = pcm -i $(SAMPLES)/amrwb/seed-14k25.awb
 fate-amrwb-14k25: CMP = stddev
 fate-amrwb-14k25: REF = $(SAMPLES)/amrwb/seed-14k25.pcm
 fate-amrwb-14k25: FUZZ = 2.6
 
-FATE_TESTS += fate-amrwb-15k85
+FATE_AMRWB += fate-amrwb-15k85
 fate-amrwb-15k85: CMD = pcm -i $(SAMPLES)/amrwb/seed-15k85.awb
 fate-amrwb-15k85: CMP = stddev
 fate-amrwb-15k85: REF = $(SAMPLES)/amrwb/seed-15k85.pcm
 fate-amrwb-15k85: FUZZ = 1
 
-FATE_TESTS += fate-amrwb-18k25
+FATE_AMRWB += fate-amrwb-18k25
 fate-amrwb-18k25: CMD = pcm -i $(SAMPLES)/amrwb/seed-18k25.awb
 fate-amrwb-18k25: CMP = stddev
 fate-amrwb-18k25: REF = $(SAMPLES)/amrwb/seed-18k25.pcm
 fate-amrwb-18k25: FUZZ = 1
 
-FATE_TESTS += fate-amrwb-19k85
+FATE_AMRWB += fate-amrwb-19k85
 fate-amrwb-19k85: CMD = pcm -i $(SAMPLES)/amrwb/seed-19k85.awb
 fate-amrwb-19k85: CMP = stddev
 fate-amrwb-19k85: REF = $(SAMPLES)/amrwb/seed-19k85.pcm
 fate-amrwb-19k85: FUZZ = 1
 
-FATE_TESTS += fate-amrwb-23k05
+FATE_AMRWB += fate-amrwb-23k05
 fate-amrwb-23k05: CMD = pcm -i $(SAMPLES)/amrwb/seed-23k05.awb
 fate-amrwb-23k05: CMP = stddev
 fate-amrwb-23k05: REF = $(SAMPLES)/amrwb/seed-23k05.pcm
 fate-amrwb-23k05: FUZZ = 2
 
-FATE_TESTS += fate-amrwb-23k85
+FATE_AMRWB += fate-amrwb-23k85
 fate-amrwb-23k85: CMD = pcm -i $(SAMPLES)/amrwb/seed-23k85.awb
 fate-amrwb-23k85: CMP = stddev
 fate-amrwb-23k85: REF = $(SAMPLES)/amrwb/seed-23k85.pcm
 fate-amrwb-23k85: FUZZ = 2
 
-FATE_TESTS += fate-amrwb-23k85-2
+FATE_AMRWB += fate-amrwb-23k85-2
 fate-amrwb-23k85-2: CMD = pcm -i $(SAMPLES)/amrwb/deus-23k85.awb
 fate-amrwb-23k85-2: CMP = stddev
 fate-amrwb-23k85-2: REF = $(SAMPLES)/amrwb/deus-23k85.pcm
 fate-amrwb-23k85-2: FUZZ = 1
+
+FATE_TESTS += $(FATE_AMRWB)
+fate-amrwb: $(FATE_AMRWB)
diff --git a/tests/fate/atrac.mak b/tests/fate/atrac.mak
index 1d586c6e79..efb1727463 100644
--- a/tests/fate/atrac.mak
+++ b/tests/fate/atrac.mak
@@ -1,19 +1,22 @@
-FATE_TESTS += fate-atrac1
+FATE_ATRAC += fate-atrac1
 fate-atrac1: CMD = pcm -i $(SAMPLES)/atrac1/test_tones_small.aea
 fate-atrac1: CMP = oneoff
 fate-atrac1: REF = $(SAMPLES)/atrac1/test_tones_small.pcm
 
-FATE_TESTS += fate-atrac3-1
+FATE_ATRAC += fate-atrac3-1
 fate-atrac3-1: CMD = pcm -i $(SAMPLES)/atrac3/mc_sich_at3_066_small.wav
 fate-atrac3-1: CMP = oneoff
 fate-atrac3-1: REF = $(SAMPLES)/atrac3/mc_sich_at3_066_small.pcm
 
-FATE_TESTS += fate-atrac3-2
+FATE_ATRAC += fate-atrac3-2
 fate-atrac3-2: CMD = pcm -i $(SAMPLES)/atrac3/mc_sich_at3_105_small.wav
 fate-atrac3-2: CMP = oneoff
 fate-atrac3-2: REF = $(SAMPLES)/atrac3/mc_sich_at3_105_small.pcm
 
-FATE_TESTS += fate-atrac3-3
+FATE_ATRAC += fate-atrac3-3
 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_TESTS += $(FATE_ATRAC)
+fate-atrac: $(FATE_ATRAC)
diff --git a/tests/fate/image.mak b/tests/fate/image.mak
index db52bd29dc..3f8a022526 100644
--- a/tests/fate/image.mak
+++ b/tests/fate/image.mak
@@ -1,32 +1,35 @@
-FATE_TESTS += fate-dpx
+FATE_IMAGE += fate-dpx
 fate-dpx: CMD = framecrc  -i $(SAMPLES)/dpx/lighthouse_rgb48.dpx
 
-FATE_TESTS += fate-fax-g3
+FATE_IMAGE += fate-fax-g3
 fate-fax-g3: CMD = framecrc -i $(SAMPLES)/CCITT_fax/G31D.TIF
 
-FATE_TESTS += fate-fax-g3s
+FATE_IMAGE += fate-fax-g3s
 fate-fax-g3s: CMD = framecrc -i $(SAMPLES)/CCITT_fax/G31DS.TIF
 
-FATE_TESTS += fate-pictor
+FATE_IMAGE += fate-pictor
 fate-pictor: CMD = framecrc -i $(SAMPLES)/pictor/MFISH.PIC -pix_fmt rgb24
 
-FATE_TESTS += fate-ptx
+FATE_IMAGE += fate-ptx
 fate-ptx: CMD = framecrc  -i $(SAMPLES)/ptx/_113kw_pic.ptx -pix_fmt rgb24
 
-FATE_TESTS += fate-sunraster-1bit-raw
+FATE_IMAGE += fate-sunraster-1bit-raw
 fate-sunraster-1bit-raw: CMD = framecrc  -i $(SAMPLES)/sunraster/lena-1bit-raw.sun
 
-FATE_TESTS += fate-sunraster-1bit-rle
+FATE_IMAGE += fate-sunraster-1bit-rle
 fate-sunraster-1bit-rle: CMD = framecrc  -i $(SAMPLES)/sunraster/lena-1bit-rle.sun
 
-FATE_TESTS += fate-sunraster-8bit-raw
+FATE_IMAGE += 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_IMAGE += 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_IMAGE += fate-sunraster-24bit-raw
 fate-sunraster-24bit-raw: CMD = framecrc  -i $(SAMPLES)/sunraster/lena-24bit-raw.sun
 
-FATE_TESTS += fate-sunraster-24bit-rle
+FATE_IMAGE += fate-sunraster-24bit-rle
 fate-sunraster-24bit-rle: CMD = framecrc  -i $(SAMPLES)/sunraster/lena-24bit-rle.sun
+
+FATE_TESTS += $(FATE_IMAGE)
+fate-image: $(FATE_IMAGE)
diff --git a/tests/fate/indeo.mak b/tests/fate/indeo.mak
index df07392790..37837fef50 100644
--- a/tests/fate/indeo.mak
+++ b/tests/fate/indeo.mak
@@ -1,8 +1,11 @@
-FATE_TESTS += fate-indeo2
+FATE_INDEO += fate-indeo2
 fate-indeo2: CMD = framecrc -i $(SAMPLES)/rt21/VPAR0026.AVI
 
-FATE_TESTS += fate-indeo3
+FATE_INDEO += fate-indeo3
 fate-indeo3: CMD = framecrc -i $(SAMPLES)/iv32/cubes.mov
 
-FATE_TESTS += fate-indeo5
+FATE_INDEO += fate-indeo5
 fate-indeo5: CMD = framecrc -i $(SAMPLES)/iv50/Educ_Movie_DeadlyForce.avi -an
+
+FATE_TESTS += $(FATE_INDEO)
+fate-indeo: $(FATE_INDEO)
diff --git a/tests/fate/libavutil.mak b/tests/fate/libavutil.mak
index a65b724305..ad03137b73 100644
--- a/tests/fate/libavutil.mak
+++ b/tests/fate/libavutil.mak
@@ -1,38 +1,41 @@
-FATE_TESTS += fate-adler32
+FATE_LIBAVUTIL += fate-adler32
 fate-adler32: libavutil/adler32-test$(EXESUF)
 fate-adler32: CMD = run libavutil/adler32-test
 fate-adler32: REF = /dev/null
 
-FATE_TESTS += fate-aes
+FATE_LIBAVUTIL += fate-aes
 fate-aes: libavutil/aes-test$(EXESUF)
 fate-aes: CMD = run libavutil/aes-test
 fate-aes: REF = /dev/null
 
-FATE_TESTS += fate-base64
+FATE_LIBAVUTIL += fate-base64
 fate-base64: libavutil/base64-test$(EXESUF)
 fate-base64: CMD = run libavutil/base64-test
 
-FATE_TESTS += fate-crc
+FATE_LIBAVUTIL += fate-crc
 fate-crc: libavutil/crc-test$(EXESUF)
 fate-crc: CMD = run libavutil/crc-test
 
-FATE_TESTS += fate-des
+FATE_LIBAVUTIL += fate-des
 fate-des: libavutil/des-test$(EXESUF)
 fate-des: CMD = run libavutil/des-test
 fate-des: REF = /dev/null
 
-FATE_TESTS += fate-eval
+FATE_LIBAVUTIL += fate-eval
 fate-eval: libavutil/eval-test$(EXESUF)
 fate-eval: CMD = run libavutil/eval-test
 
-FATE_TESTS += fate-fifo
+FATE_LIBAVUTIL += fate-fifo
 fate-fifo: libavutil/fifo-test$(EXESUF)
 fate-fifo: CMD = run libavutil/fifo-test
 
-FATE_TESTS += fate-md5
+FATE_LIBAVUTIL += fate-md5
 fate-md5: libavutil/md5-test$(EXESUF)
 fate-md5: CMD = run libavutil/md5-test
 
-FATE_TESTS += fate-sha
+FATE_LIBAVUTIL += fate-sha
 fate-sha: libavutil/sha-test$(EXESUF)
 fate-sha: CMD = run libavutil/sha-test
+
+FATE_TESTS += $(FATE_LIBAVUTIL)
+fate-libavutil: $(FATE_LIBAVUTIL)
diff --git a/tests/fate/lossless-audio.mak b/tests/fate/lossless-audio.mak
index e73559743e..105280be8a 100644
--- a/tests/fate/lossless-audio.mak
+++ b/tests/fate/lossless-audio.mak
@@ -1,17 +1,20 @@
-FATE_TESTS += fate-lossless-appleaudio
+FATE_LOSSLESS_AUDIO += fate-lossless-appleaudio
 fate-lossless-appleaudio: CMD = md5  -i $(SAMPLES)/lossless-audio/inside.m4a -f s16le
 
-FATE_TESTS += fate-lossless-meridianaudio
+FATE_LOSSLESS_AUDIO += fate-lossless-meridianaudio
 fate-lossless-meridianaudio: CMD = md5  -i $(SAMPLES)/lossless-audio/luckynight-partial.mlp -f s16le
 
-FATE_TESTS += fate-lossless-monkeysaudio
+FATE_LOSSLESS_AUDIO += fate-lossless-monkeysaudio
 fate-lossless-monkeysaudio: CMD = md5  -i $(SAMPLES)/lossless-audio/luckynight-partial.ape -f s16le
 
-FATE_TESTS += fate-lossless-shortenaudio
+FATE_LOSSLESS_AUDIO += fate-lossless-shortenaudio
 fate-lossless-shortenaudio: CMD = md5  -i $(SAMPLES)/lossless-audio/luckynight-partial.shn -f s16le
 
-FATE_TESTS += fate-lossless-tta
+FATE_LOSSLESS_AUDIO += fate-lossless-tta
 fate-lossless-tta: CMD = crc  -i $(SAMPLES)/lossless-audio/inside.tta
 
-FATE_TESTS += fate-lossless-wavpackaudio
+FATE_LOSSLESS_AUDIO += fate-lossless-wavpackaudio
 fate-lossless-wavpackaudio: CMD = md5  -i $(SAMPLES)/lossless-audio/luckynight-partial.wv -f s16le
+
+FATE_TESTS += $(FATE_LOSSLESS_AUDIO)
+fate-lossless-audio: $(FATE_LOSSLESS_AUDIO)
diff --git a/tests/fate/lossless-video.mak b/tests/fate/lossless-video.mak
index 0d1e2b88e1..42efe186e4 100644
--- a/tests/fate/lossless-video.mak
+++ b/tests/fate/lossless-video.mak
@@ -1,17 +1,20 @@
-FATE_TESTS += fate-loco-rgb
+FATE_LOSSLESS_VIDEO += fate-loco-rgb
 fate-loco-rgb: CMD = framecrc  -i $(SAMPLES)/loco/pig-loco-rgb.avi
 
-FATE_TESTS += fate-loco-yuy2
+FATE_LOSSLESS_VIDEO += fate-loco-yuy2
 fate-loco-yuy2: CMD = framecrc  -i $(SAMPLES)/loco/pig-loco-0.avi
 
-FATE_TESTS += fate-msrle-8bit
+FATE_LOSSLESS_VIDEO += fate-msrle-8bit
 fate-msrle-8bit: CMD = framecrc  -i $(SAMPLES)/msrle/Search-RLE.avi -pix_fmt rgb24
 
-FATE_TESTS += fate-mszh
+FATE_LOSSLESS_VIDEO += fate-mszh
 fate-mszh: CMD = framecrc  -i $(SAMPLES)/lcl/mszh-1frame.avi
 
-FATE_TESTS += fate-vble
+FATE_LOSSLESS_VIDEO += fate-vble
 fate-vble: CMD = framecrc -i $(SAMPLES)/vble/flowers-partial-2MB.avi
 
-FATE_TESTS += fate-zlib
+FATE_LOSSLESS_VIDEO += fate-zlib
 fate-zlib: CMD = framecrc  -i $(SAMPLES)/lcl/zlib-1frame.avi
+
+FATE_TESTS += $(FATE_LOSSLESS_VIDEO)
+fate-lossless-video: $(FATE_LOSSLESS_VIDEO)
diff --git a/tests/fate/qtrle.mak b/tests/fate/qtrle.mak
index 4856fe7b96..7b7cfb03b5 100644
--- a/tests/fate/qtrle.mak
+++ b/tests/fate/qtrle.mak
@@ -1,20 +1,23 @@
-FATE_TESTS += fate-qtrle-1bit
+FATE_QTRLE += fate-qtrle-1bit
 fate-qtrle-1bit: CMD = framecrc  -i $(SAMPLES)/qtrle/Animation-Monochrome.mov
 
-FATE_TESTS += fate-qtrle-2bit
+FATE_QTRLE += fate-qtrle-2bit
 fate-qtrle-2bit: CMD = framecrc  -i $(SAMPLES)/qtrle/Animation-4Greys.mov -pix_fmt rgb24
 
-FATE_TESTS += fate-qtrle-4bit
+FATE_QTRLE += fate-qtrle-4bit
 fate-qtrle-4bit: CMD = framecrc  -i $(SAMPLES)/qtrle/Animation-16Greys.mov -pix_fmt rgb24 -an
 
-FATE_TESTS += fate-qtrle-8bit
+FATE_QTRLE += fate-qtrle-8bit
 fate-qtrle-8bit: CMD = framecrc  -i $(SAMPLES)/qtrle/criticalpath-credits.mov -vsync 0 -pix_fmt rgb24 -an
 
-FATE_TESTS += fate-qtrle-16bit
+FATE_QTRLE += fate-qtrle-16bit
 fate-qtrle-16bit: CMD = framecrc  -i $(SAMPLES)/qtrle/mr-cork-rle.mov -pix_fmt rgb24
 
-FATE_TESTS += fate-qtrle-24bit
+FATE_QTRLE += fate-qtrle-24bit
 fate-qtrle-24bit: CMD = framecrc  -i $(SAMPLES)/qtrle/aletrek-rle.mov -vsync 0
 
-FATE_TESTS += fate-qtrle-32bit
+FATE_QTRLE += fate-qtrle-32bit
 fate-qtrle-32bit: CMD = framecrc  -i $(SAMPLES)/qtrle/ultra_demo_720_480_32bpp_rle.mov -pix_fmt rgb24
+
+FATE_TESTS += $(FATE_QTRLE)
+fate-qtrle: $(FATE_QTRLE)
diff --git a/tests/fate/real.mak b/tests/fate/real.mak
index b1ff50713b..978a1256be 100644
--- a/tests/fate/real.mak
+++ b/tests/fate/real.mak
@@ -1,39 +1,42 @@
-FATE_TESTS += fate-real-14_4
+FATE_REAL += fate-real-14_4
 fate-real-14_4: CMD = md5  -i $(SAMPLES)/real/ra3_in_rm_file.rm -f s16le
 
-FATE_TESTS += fate-ra-288
+FATE_REAL += fate-ra-288
 fate-ra-288: CMD = pcm -i $(SAMPLES)/real/ra_288.rm
 fate-ra-288: CMP = oneoff
 fate-ra-288: REF = $(SAMPLES)/real/ra_288.pcm
 fate-ra-288: FUZZ = 2
 
-FATE_TESTS += fate-ra-cook
+FATE_REAL += fate-ra-cook
 fate-ra-cook: CMD = pcm -i $(SAMPLES)/real/ra_cook.rm
 fate-ra-cook: CMP = oneoff
 fate-ra-cook: REF = $(SAMPLES)/real/ra_cook.pcm
 
-FATE_TESTS += fate-rv30
+FATE_REAL += fate-rv30
 fate-rv30: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/real/rv30.rm -an
 
-FATE_TESTS += fate-real-rv40
+FATE_REAL += fate-real-rv40
 fate-real-rv40: CMD = framecrc  -i $(SAMPLES)/real/spygames-2MB.rmvb -t 10 -an -vsync 0
 
-FATE_TESTS += fate-sipr-5k0
+FATE_REAL += fate-sipr-5k0
 fate-sipr-5k0: CMD = pcm -i $(SAMPLES)/sipr/sipr_5k0.rm
 fate-sipr-5k0: CMP = oneoff
 fate-sipr-5k0: REF = $(SAMPLES)/sipr/sipr_5k0.pcm
 
-FATE_TESTS += fate-sipr-6k5
+FATE_REAL += fate-sipr-6k5
 fate-sipr-6k5: CMD = pcm -i $(SAMPLES)/sipr/sipr_6k5.rm
 fate-sipr-6k5: CMP = oneoff
 fate-sipr-6k5: REF = $(SAMPLES)/sipr/sipr_6k5.pcm
 
-FATE_TESTS += fate-sipr-8k5
+FATE_REAL += fate-sipr-8k5
 fate-sipr-8k5: CMD = pcm -i $(SAMPLES)/sipr/sipr_8k5.rm
 fate-sipr-8k5: CMP = oneoff
 fate-sipr-8k5: REF = $(SAMPLES)/sipr/sipr_8k5.pcm
 
-FATE_TESTS += fate-sipr-16k
+FATE_REAL += fate-sipr-16k
 fate-sipr-16k: CMD = pcm -i $(SAMPLES)/sipr/sipr_16k.rm
 fate-sipr-16k: CMP = oneoff
 fate-sipr-16k: REF = $(SAMPLES)/sipr/sipr_16k.pcm
+
+FATE_TESTS += $(FATE_REAL)
+fate-real: $(FATE_REAL)
diff --git a/tests/fate/screen.mak b/tests/fate/screen.mak
index a296b00eb0..17cf957629 100644
--- a/tests/fate/screen.mak
+++ b/tests/fate/screen.mak
@@ -1,44 +1,47 @@
-FATE_TESTS += fate-cscd
+FATE_SCREEN += fate-cscd
 fate-cscd: CMD = framecrc  -i $(SAMPLES)/CSCD/sample_video.avi -an -vsync 0 -pix_fmt rgb24
 
-FATE_TESTS += fate-fraps-v0
+FATE_SCREEN += fate-fraps-v0
 fate-fraps-v0: CMD = framecrc  -i $(SAMPLES)/fraps/Griffin_Ragdoll01-partial.avi
 
-FATE_TESTS += fate-fraps-v1
+FATE_SCREEN += fate-fraps-v1
 fate-fraps-v1: CMD = framecrc  -i $(SAMPLES)/fraps/sample-v1.avi -an
 
-FATE_TESTS += fate-fraps-v2
+FATE_SCREEN += fate-fraps-v2
 fate-fraps-v2: CMD = framecrc  -i $(SAMPLES)/fraps/test3-nosound-partial.avi
 
-FATE_TESTS += fate-fraps-v3
+FATE_SCREEN += fate-fraps-v3
 fate-fraps-v3: CMD = framecrc  -i $(SAMPLES)/fraps/psclient-partial.avi -pix_fmt rgb24
 
-FATE_TESTS += fate-fraps-v4
+FATE_SCREEN += fate-fraps-v4
 fate-fraps-v4: CMD = framecrc  -i $(SAMPLES)/fraps/WoW_2006-11-03_14-58-17-19-nosound-partial.avi
 
-FATE_TESTS += fate-fraps-v5
+FATE_SCREEN += fate-fraps-v5
 fate-fraps-v5: CMD = framecrc  -i $(SAMPLES)/fraps/fraps-v5-bouncing-balls-partial.avi
 
-FATE_TESTS += fate-tscc-15bit
+FATE_SCREEN += fate-tscc-15bit
 fate-tscc-15bit: CMD = framecrc  -i $(SAMPLES)/tscc/oneminute.avi -t 15 -pix_fmt rgb24
 
-FATE_TESTS += fate-tscc-32bit
+FATE_SCREEN += fate-tscc-32bit
 fate-tscc-32bit: CMD = framecrc  -i $(SAMPLES)/tscc/2004-12-17-uebung9-partial.avi -pix_fmt rgb24 -an
 
-FATE_TESTS += fate-vmnc-16bit
+FATE_SCREEN += fate-vmnc-16bit
 fate-vmnc-16bit: CMD = framecrc  -i $(SAMPLES)/VMnc/test.avi -pix_fmt rgb24
 
-FATE_TESTS += fate-vmnc-32bit
+FATE_SCREEN += fate-vmnc-32bit
 fate-vmnc-32bit: CMD = framecrc  -i $(SAMPLES)/VMnc/VS2k5DebugDemo-01-partial.avi -pix_fmt rgb24
 
-FATE_TESTS += fate-zmbv-8bit
+FATE_SCREEN += fate-zmbv-8bit
 fate-zmbv-8bit: CMD = framecrc  -i $(SAMPLES)/zmbv/wc2_001-partial.avi -an -pix_fmt rgb24
 
-FATE_TESTS += fate-zmbv-15bit
+FATE_SCREEN += fate-zmbv-15bit
 fate-zmbv-15bit: CMD = framecrc  -i $(SAMPLES)/zmbv/zmbv_15bit.avi -pix_fmt rgb24 -t 25
 
-FATE_TESTS += fate-zmbv-16bit
+FATE_SCREEN += fate-zmbv-16bit
 fate-zmbv-16bit: CMD = framecrc  -i $(SAMPLES)/zmbv/zmbv_16bit.avi -pix_fmt rgb24 -t 25
 
-FATE_TESTS += fate-zmbv-32bit
+FATE_SCREEN += fate-zmbv-32bit
 fate-zmbv-32bit: CMD = framecrc  -i $(SAMPLES)/zmbv/zmbv_32bit.avi -pix_fmt rgb24 -t 25
+
+FATE_TESTS += $(FATE_SCREEN)
+fate-screen: $(FATE_SCREEN)
diff --git a/tests/fate/utvideo.mak b/tests/fate/utvideo.mak
index 6ff0025686..7cf6237b1e 100644
--- a/tests/fate/utvideo.mak
+++ b/tests/fate/utvideo.mak
@@ -1,23 +1,26 @@
-FATE_TESTS += fate-utvideo_rgba_left
+FATE_UTVIDEO += fate-utvideo_rgba_left
 fate-utvideo_rgba_left: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_rgba_left.avi
 
-FATE_TESTS += fate-utvideo_rgba_median
+FATE_UTVIDEO += fate-utvideo_rgba_median
 fate-utvideo_rgba_median: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_rgba_median.avi
 
-FATE_TESTS += fate-utvideo_rgb_left
+FATE_UTVIDEO += fate-utvideo_rgb_left
 fate-utvideo_rgb_left: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_rgb_left.avi
 
-FATE_TESTS += fate-utvideo_rgb_median
+FATE_UTVIDEO += fate-utvideo_rgb_median
 fate-utvideo_rgb_median: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_rgb_median.avi
 
-FATE_TESTS += fate-utvideo_yuv420_left
+FATE_UTVIDEO += fate-utvideo_yuv420_left
 fate-utvideo_yuv420_left: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_yuv420_left.avi
 
-FATE_TESTS += fate-utvideo_yuv420_median
+FATE_UTVIDEO += fate-utvideo_yuv420_median
 fate-utvideo_yuv420_median: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_yuv420_median.avi
 
-FATE_TESTS += fate-utvideo_yuv422_left
+FATE_UTVIDEO += fate-utvideo_yuv422_left
 fate-utvideo_yuv422_left: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_yuv422_left.avi
 
-FATE_TESTS += fate-utvideo_yuv422_median
+FATE_UTVIDEO += fate-utvideo_yuv422_median
 fate-utvideo_yuv422_median: CMD = framecrc -i $(SAMPLES)/utvideo/utvideo_yuv422_median.avi
+
+FATE_TESTS += $(FATE_UTVIDEO)
+fate-utvideo: $(FATE_UTVIDEO)
diff --git a/tests/fate/wma.mak b/tests/fate/wma.mak
index 25626f3db6..ca4b8243ae 100644
--- a/tests/fate/wma.mak
+++ b/tests/fate/wma.mak
@@ -1,27 +1,30 @@
-FATE_TESTS += fate-wmapro-2ch
+FATE_WMA += fate-wmapro-2ch
 fate-wmapro-2ch: CMD = pcm -i $(SAMPLES)/wmapro/Beethovens_9th-1_small.wma
 fate-wmapro-2ch: CMP = oneoff
 fate-wmapro-2ch: REF = $(SAMPLES)/wmapro/Beethovens_9th-1_small.pcm
 
-FATE_TESTS += fate-wmapro-5.1
+FATE_WMA += fate-wmapro-5.1
 fate-wmapro-5.1: CMD = pcm -i $(SAMPLES)/wmapro/latin_192_mulitchannel_cut.wma
 fate-wmapro-5.1: CMP = oneoff
 fate-wmapro-5.1: REF = $(SAMPLES)/wmapro/latin_192_mulitchannel_cut.pcm
 
-FATE_TESTS += fate-wmavoice-7k
+FATE_WMA += fate-wmavoice-7k
 fate-wmavoice-7k: CMD = pcm -i $(SAMPLES)/wmavoice/streaming_CBR-7K.wma
 fate-wmavoice-7k: CMP = stddev
 fate-wmavoice-7k: REF = $(SAMPLES)/wmavoice/streaming_CBR-7K.pcm
 fate-wmavoice-7k: FUZZ = 3
 
-FATE_TESTS += fate-wmavoice-11k
+FATE_WMA += fate-wmavoice-11k
 fate-wmavoice-11k: CMD = pcm -i $(SAMPLES)/wmavoice/streaming_CBR-11K.wma
 fate-wmavoice-11k: CMP = stddev
 fate-wmavoice-11k: REF = $(SAMPLES)/wmavoice/streaming_CBR-11K.pcm
 fate-wmavoice-11k: FUZZ = 3
 
-FATE_TESTS += fate-wmavoice-19k
+FATE_WMA += fate-wmavoice-19k
 fate-wmavoice-19k: CMD = pcm -i $(SAMPLES)/wmavoice/streaming_CBR-19K.wma
 fate-wmavoice-19k: CMP = stddev
 fate-wmavoice-19k: REF = $(SAMPLES)/wmavoice/streaming_CBR-19K.pcm
 fate-wmavoice-19k: FUZZ = 3
+
+FATE_TESTS += $(FATE_WMA)
+fate-wma: $(FATE_WMA)