From 715e9be267bcf21565a863450889fe24755bafac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Sun, 22 Aug 2010 14:24:58 +0000 Subject: [PATCH] fate: remove pointless fate/fate2 separation Originally committed as revision 24868 to svn://svn.ffmpeg.org/ffmpeg/trunk --- Makefile | 5 +--- tests/fate2.mak | 68 ++++++++++++++++++++++++------------------------- 2 files changed, 35 insertions(+), 38 deletions(-) diff --git a/Makefile b/Makefile index a66d6c8f1c..783034dc42 100644 --- a/Makefile +++ b/Makefile @@ -239,8 +239,6 @@ include $(SRC_PATH_BARE)/tests/fate/h264.mak include $(SRC_PATH_BARE)/tests/fate/vorbis.mak include $(SRC_PATH_BARE)/tests/fate/vp8.mak -FATE_TESTS += $(FATE2_TESTS) - FATE_ACODEC = $(ACODEC_TESTS:%=fate-acodec-%) FATE_VSYNTH1 = $(VCODEC_TESTS:%=fate-vsynth1-%) FATE_VSYNTH2 = $(VCODEC_TESTS:%=fate-vsynth2-%) @@ -278,14 +276,13 @@ fate-seek: $(FATE_SEEK) ifdef SAMPLES FATE += $(FATE_TESTS) else -fate2 $(FATE_TESTS): +$(FATE_TESTS): @echo "SAMPLES not specified, cannot run FATE" endif FATE_UTILS = base64 tiny_psnr fate: $(FATE) -fate2: $(FATE2_TESTS) $(FATE): ffmpeg$(EXESUF) $(FATE_UTILS:%=tests/%$(HOSTEXESUF)) @echo "TEST $(@:fate-%=%)" diff --git a/tests/fate2.mak b/tests/fate2.mak index 353740d603..f08a888889 100644 --- a/tests/fate2.mak +++ b/tests/fate2.mak @@ -1,162 +1,162 @@ -FATE2_TESTS += fate-twinvq +FATE_TESTS += fate-twinvq fate-twinvq: CMD = pcm -i $(SAMPLES)/vqf/achterba.vqf fate-twinvq: CMP = oneoff fate-twinvq: REF = $(SAMPLES)/vqf/achterba.pcm -FATE2_TESTS += fate-sipr-16k +FATE_TESTS += 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 -FATE2_TESTS += fate-sipr-8k5 +FATE_TESTS += 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 -FATE2_TESTS += fate-sipr-6k5 +FATE_TESTS += 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 -FATE2_TESTS += fate-sipr-5k0 +FATE_TESTS += 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 -FATE2_TESTS += fate-ra-288 +FATE_TESTS += 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 -FATE2_TESTS += fate-ra-cook +FATE_TESTS += 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 -FATE2_TESTS += fate-mpeg2-field-enc +FATE_TESTS += fate-mpeg2-field-enc fate-mpeg2-field-enc: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/mpeg2/mpeg2_field_encoding.ts -an -FATE2_TESTS += fate-qcelp +FATE_TESTS += fate-qcelp fate-qcelp: CMD = pcm -i $(SAMPLES)/qcp/0036580847.QCP fate-qcelp: CMP = oneoff fate-qcelp: REF = $(SAMPLES)/qcp/0036580847.pcm -FATE2_TESTS += fate-qdm2 +FATE_TESTS += 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 -FATE2_TESTS += fate-imc +FATE_TESTS += fate-imc fate-imc: CMD = pcm -i $(SAMPLES)/imc/imc.avi fate-imc: CMP = oneoff fate-imc: REF = $(SAMPLES)/imc/imc.pcm -FATE2_TESTS += fate-yop +FATE_TESTS += fate-yop fate-yop: CMD = framecrc -i $(SAMPLES)/yop/test1.yop -pix_fmt rgb24 -an -FATE2_TESTS += fate-pictor +FATE_TESTS += fate-pictor fate-pictor: CMD = framecrc -i $(SAMPLES)/pictor/MFISH.PIC -pix_fmt rgb24 -an -FATE2_TESTS += fate-dts +FATE_TESTS += fate-dts fate-dts: CMD = pcm -i $(SAMPLES)/dts/dts.ts fate-dts: CMP = oneoff fate-dts: REF = $(SAMPLES)/dts/dts.pcm -FATE2_TESTS += fate-nellymoser +FATE_TESTS += fate-nellymoser fate-nellymoser: CMD = pcm -i $(SAMPLES)/nellymoser/nellymoser.flv fate-nellymoser: CMP = oneoff fate-nellymoser: REF = $(SAMPLES)/nellymoser/nellymoser.pcm -FATE2_TESTS += fate-truespeech +FATE_TESTS += fate-truespeech fate-truespeech: CMD = pcm -i $(SAMPLES)/truespeech/a6.wav fate-truespeech: CMP = oneoff fate-truespeech: REF = $(SAMPLES)/truespeech/a6.pcm -FATE2_TESTS += fate-ac3-2.0 +FATE_TESTS += 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 -FATE2_TESTS += fate-ac3-5.1 +FATE_TESTS += 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 -FATE2_TESTS += fate-eac3-1 +FATE_TESTS += 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 -FATE2_TESTS += fate-eac3-2 +FATE_TESTS += 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 -FATE2_TESTS += fate-eac3-3 +FATE_TESTS += 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 -FATE2_TESTS += fate-eac3-4 +FATE_TESTS += 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 -FATE2_TESTS += fate-atrac1 +FATE_TESTS += 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 -FATE2_TESTS += fate-atrac3-1 +FATE_TESTS += 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 -FATE2_TESTS += fate-atrac3-2 +FATE_TESTS += 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 -FATE2_TESTS += fate-atrac3-3 +FATE_TESTS += 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 -FATE2_TESTS += fate-gsm +FATE_TESTS += fate-gsm fate-gsm: CMD = framecrc -i $(SAMPLES)/gsm/ciao.wav -FATE2_TESTS += fate-msmpeg4v1 +FATE_TESTS += fate-msmpeg4v1 fate-msmpeg4v1: CMD = framecrc -flags +bitexact -dct fastint -idct simple -i $(SAMPLES)/msmpeg4v1/mpg4.avi -an -FATE2_TESTS += fate-wmavoice-7k +FATE_TESTS += 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 -FATE2_TESTS += fate-wmavoice-11k +FATE_TESTS += 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 -FATE2_TESTS += fate-wmavoice-19k +FATE_TESTS += 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 -FATE2_TESTS += fate-wmapro-5.1 +FATE_TESTS += 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 -FATE2_TESTS += fate-wmapro-2ch +FATE_TESTS += 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 -FATE2_TESTS += fate-ansi +FATE_TESTS += fate-ansi fate-ansi: CMD = framecrc -i $(SAMPLES)/ansi/TRE-IOM5.ANS -pix_fmt rgb24