From bebf9f923ed628393321260c13b45ae5ce4bb3af Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Wed, 14 Dec 2011 22:22:33 +0100
Subject: [PATCH] fate: group all VP* codec FATE tests together in one file

---
 tests/Makefile                  |  2 +-
 tests/fate.mak                  | 10 ----------
 tests/fate/{vp8.mak => vpx.mak} | 18 ++++++++++++++++++
 tests/fate2.mak                 |  3 ---
 4 files changed, 19 insertions(+), 14 deletions(-)
 rename tests/fate/{vp8.mak => vpx.mak} (58%)

diff --git a/tests/Makefile b/tests/Makefile
index 6b08619e4b..9dff81e0a8 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -47,7 +47,7 @@ include $(SRC_PATH)/tests/fate/real.mak
 include $(SRC_PATH)/tests/fate/screen.mak
 include $(SRC_PATH)/tests/fate/utvideo.mak
 include $(SRC_PATH)/tests/fate/vorbis.mak
-include $(SRC_PATH)/tests/fate/vp8.mak
+include $(SRC_PATH)/tests/fate/vpx.mak
 include $(SRC_PATH)/tests/fate/wma.mak
 
 FATE_ACODEC  = $(ACODEC_TESTS:%=fate-acodec-%)
diff --git a/tests/fate.mak b/tests/fate.mak
index cd976badb8..93b6950693 100644
--- a/tests/fate.mak
+++ b/tests/fate.mak
@@ -90,10 +90,6 @@ FATE_TESTS += 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-tqi-adpcm
 fate-ea-tqi-adpcm: CMD = framecrc  -i $(SAMPLES)/ea-wve/networkBackbone-partial.wve -frames:v 26
-FATE_TESTS += fate-ea-vp60
-fate-ea-vp60: CMD = framecrc  -i $(SAMPLES)/ea-vp6/g36.vp6
-FATE_TESTS += fate-ea-vp61
-fate-ea-vp61: CMD = framecrc  -i $(SAMPLES)/ea-vp6/MovieSkirmishGondor.vp6 -t 4
 FATE_TESTS += fate-feeble-dxa
 fate-feeble-dxa: CMD = framecrc  -i $(SAMPLES)/dxa/meetsquid.dxa -t 2 -pix_fmt rgb24
 FATE_TESTS += fate-film-cvid-pcm-stereo-8bit
@@ -250,12 +246,6 @@ FATE_TESTS += fate-vcr1
 fate-vcr1: CMD = framecrc  -i $(SAMPLES)/vcr1/VCR1test.avi -an
 FATE_TESTS += fate-video-xl
 fate-video-xl: CMD = framecrc  -i $(SAMPLES)/vixl/pig-vixl.avi
-FATE_TESTS += fate-vp5
-fate-vp5: CMD = framecrc  -i $(SAMPLES)/vp5/potter512-400-partial.avi -an
-FATE_TESTS += fate-vp6a
-fate-vp6a: CMD = framecrc  -i $(SAMPLES)/flash-vp6/300x180-Scr-f8-056alpha.flv
-FATE_TESTS += fate-vp6f
-fate-vp6f: CMD = framecrc  -i $(SAMPLES)/flash-vp6/clip1024.flv
 FATE_TESTS += fate-vqa-cc
 fate-vqa-cc: CMD = framecrc  -i $(SAMPLES)/vqa/cc-demo1-partial.vqa -pix_fmt rgb24
 FATE_TESTS += fate-vqf-demux
diff --git a/tests/fate/vp8.mak b/tests/fate/vpx.mak
similarity index 58%
rename from tests/fate/vp8.mak
rename to tests/fate/vpx.mak
index be8f50aaf8..66e9ced3f4 100644
--- a/tests/fate/vp8.mak
+++ b/tests/fate/vpx.mak
@@ -1,3 +1,21 @@
+FATE_TESTS += fate-ea-vp60
+fate-ea-vp60: CMD = framecrc  -i $(SAMPLES)/ea-vp6/g36.vp6
+
+FATE_TESTS += fate-ea-vp61
+fate-ea-vp61: CMD = framecrc  -i $(SAMPLES)/ea-vp6/MovieSkirmishGondor.vp6 -t 4
+
+FATE_TESTS += fate-vp3
+fate-vp3: CMD = framecrc -i $(SAMPLES)/vp3/vp31.avi
+
+FATE_TESTS += fate-vp5
+fate-vp5: CMD = framecrc  -i $(SAMPLES)/vp5/potter512-400-partial.avi -an
+
+FATE_TESTS += fate-vp6a
+fate-vp6a: CMD = framecrc  -i $(SAMPLES)/flash-vp6/300x180-Scr-f8-056alpha.flv
+
+FATE_TESTS += fate-vp6f
+fate-vp6f: CMD = framecrc  -i $(SAMPLES)/flash-vp6/clip1024.flv
+
 VP8_SUITE = 001 002 003 004 005 006 007 008 009 010 011 012 013 014 015 016 017
 
 define FATE_VP8_SUITE
diff --git a/tests/fate2.mak b/tests/fate2.mak
index e78a8a3231..10ef09dad4 100644
--- a/tests/fate2.mak
+++ b/tests/fate2.mak
@@ -84,9 +84,6 @@ fate-txd-pal8: CMD = framecrc -i $(SAMPLES)/txd/outro.txd -pix_fmt rgb24 -an
 FATE_TESTS += fate-txd-16bpp
 fate-txd-16bpp: CMD = framecrc -i $(SAMPLES)/txd/misc.txd -pix_fmt bgra -an
 
-FATE_TESTS += fate-vp3
-fate-vp3: CMD = framecrc -i $(SAMPLES)/vp3/vp31.avi
-
 FATE_TESTS += fate-ws_snd
 fate-ws_snd: CMD = md5  -i $(SAMPLES)/vqa/ws_snd.vqa -f s16le