diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-10 16:13:51 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-10 16:13:51 +0400 |
| commit | c6d39fb3c5a763c2cfba34154e0f8ba52f02a96e (patch) | |
| tree | 2c2e94db251ff485d92f4ee81396342265132b9b /tests/fate/voice.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/voice.mak')
| -rw-r--r-- | tests/fate/voice.mak | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/tests/fate/voice.mak b/tests/fate/voice.mak index 6d80b7ff42..3535d55b1e 100644 --- a/tests/fate/voice.mak +++ b/tests/fate/voice.mak @@ -37,25 +37,20 @@ FATE_SAMPLES_AVCONV += $(FATE_G723_1) fate-g723_1: $(FATE_G723_1) FATE_G726 += fate-g726-encode-2bit -fate-g726-encode-2bit: tests/data/asynth-8000-1.wav -fate-g726-encode-2bit: SRC = tests/data/asynth-8000-1.wav fate-g726-encode-2bit: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g726 -b:a 16k FATE_G726 += fate-g726-encode-3bit -fate-g726-encode-3bit: tests/data/asynth-8000-1.wav -fate-g726-encode-3bit: SRC = tests/data/asynth-8000-1.wav fate-g726-encode-3bit: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g726 -b:a 24k FATE_G726 += fate-g726-encode-4bit -fate-g726-encode-4bit: tests/data/asynth-8000-1.wav -fate-g726-encode-4bit: SRC = tests/data/asynth-8000-1.wav fate-g726-encode-4bit: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g726 -b:a 32k FATE_G726 += fate-g726-encode-5bit -fate-g726-encode-5bit: tests/data/asynth-8000-1.wav -fate-g726-encode-5bit: SRC = tests/data/asynth-8000-1.wav fate-g726-encode-5bit: CMD = enc_dec_pcm wav md5 s16le $(SRC) -c:a g726 -b:a 40k +$(FATE_G726): tests/data/asynth-8000-1.wav +$(FATE_G726): SRC = tests/data/asynth-8000-1.wav + FATE_VOICE += $(FATE_G726) fate-g726: $(FATE_G726) |