diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-06 15:11:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-06 15:11:53 +0100 |
| commit | 1e4e4979117e91360185edd5f58026e5e090fe41 (patch) | |
| tree | c768872bd48451a984d20a067d105b370335af98 /tests/fate/atrac.mak | |
| parent | 0fe8c9f4585866457b5eb79aa34c32468ad39425 (diff) | |
| parent | e6c4c0f7cfaf0378a70f6f7f0611d4c21433067a (diff) | |
| download | ffmpeg-1e4e4979117e91360185edd5f58026e5e090fe41.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: atrac: Place atrac1 and atrac3 tests in different groups
fate: aac: cosmetics: Group AAC LATM tests together
x86: avresample: Add missing colons to assembly labels
Conflicts:
tests/fate/aac.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/atrac.mak')
| -rw-r--r-- | tests/fate/atrac.mak | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/tests/fate/atrac.mak b/tests/fate/atrac.mak index 08a6b25bd1..39b788a1ca 100644 --- a/tests/fate/atrac.mak +++ b/tests/fate/atrac.mak @@ -1,20 +1,24 @@ -FATE_ATRAC += fate-atrac1 +FATE_ATRAC1 += fate-atrac1 fate-atrac1: CMD = pcm -i $(SAMPLES)/atrac1/test_tones_small.aea fate-atrac1: REF = $(SAMPLES)/atrac1/test_tones_small.pcm -FATE_ATRAC += fate-atrac3-1 +FATE_ATRAC3 += fate-atrac3-1 fate-atrac3-1: CMD = pcm -i $(SAMPLES)/atrac3/mc_sich_at3_066_small.wav fate-atrac3-1: REF = $(SAMPLES)/atrac3/mc_sich_at3_066_small.pcm -FATE_ATRAC += fate-atrac3-2 +FATE_ATRAC3 += fate-atrac3-2 fate-atrac3-2: CMD = pcm -i $(SAMPLES)/atrac3/mc_sich_at3_105_small.wav fate-atrac3-2: REF = $(SAMPLES)/atrac3/mc_sich_at3_105_small.pcm -FATE_ATRAC += fate-atrac3-3 +FATE_ATRAC3 += fate-atrac3-3 fate-atrac3-3: CMD = pcm -i $(SAMPLES)/atrac3/mc_sich_at3_132_small.wav fate-atrac3-3: REF = $(SAMPLES)/atrac3/mc_sich_at3_132_small.pcm -$(FATE_ATRAC): CMP = oneoff +FATE_ATRAC_ALL = $(FATE_ATRAC1) $(FATE_ATRAC3) -FATE_SAMPLES_AVCONV += $(FATE_ATRAC) -fate-atrac: $(FATE_ATRAC) +$(FATE_ATRAC_ALL): CMP = oneoff + +FATE_SAMPLES_AVCONV += $(FATE_ATRAC_ALL) + +fate-atrac: $(FATE_ATRAC_ALL) +fate-atrac3: $(FATE_ATRAC3) |