diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-10 14:13:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-10 14:13:51 +0200 |
| commit | c6d39fb3c5a763c2cfba34154e0f8ba52f02a96e (patch) | |
| tree | 2c2e94db251ff485d92f4ee81396342265132b9b /tests/fate/real.mak | |
| parent | cd6f5c4895c49b483542030324ea5198521ab28b (diff) | |
| parent | 4b895cb294d610fb3bf9e57385e665488e8a9ffa (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: sanitize linking of tools and test programs
fate: Refactor setting of environment variables for groups of tests
Conflicts:
tests/fate/audio.mak
tests/fate/real.mak
tests/fate/voice.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/real.mak')
| -rw-r--r-- | tests/fate/real.mak | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/fate/real.mak b/tests/fate/real.mak index aa3a5afee1..3ebbd9e532 100644 --- a/tests/fate/real.mak +++ b/tests/fate/real.mak @@ -23,24 +23,22 @@ fate-rv40: CMD = framecrc -i $(SAMPLES)/real/spygames-2MB.rmvb -t 10 -an FATE_SIPR += 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_SIPR += 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_SIPR += 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_SIPR += 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_SIPR): CMP = oneoff + FATE_REAL += $(FATE_SIPR) fate-sipr: $(FATE_SIPR) |