diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2012-04-24 01:21:55 +0400 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2012-04-24 01:26:05 +0400 |
| commit | c799e462317be4c1cac6c2c3c82dd13e7ff9ad0f (patch) | |
| tree | 62238f0628436dc794975d73f60e72cbd90c5889 | |
| parent | 29545741266a03332f2758c7ba4f77f362c3668d (diff) | |
Get rid of tests/data/asynth-%.sw rule.
This also avoids an issue with parallel make in some
cases never building asynth-16000-1.sw.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
| -rw-r--r-- | tests/Makefile | 3 | ||||
| -rwxr-xr-x | tests/codec-regression.sh | 2 | ||||
| -rwxr-xr-x | tests/regression-funcs.sh | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/tests/Makefile b/tests/Makefile index 4d794586a1..bbe8eec0f6 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -5,7 +5,7 @@ VREF = fate-vsynth1-vref fate-vsynth2-vref REFS = $(AREF) $(VREF) $(VREF): ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm -$(AREF): ffmpeg$(EXESUF) tests/data/asynth1.sw tests/data/asynth-16000-1.sw +$(AREF): ffmpeg$(EXESUF) tests/data/asynth1.sw tests/data/asynth-16000-1.wav $(AREF): CMP= ffservertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/data/asynth1.sw @@ -26,7 +26,6 @@ tests/vsynth2/00.pgm: tests/rotozoom$(HOSTEXESUF) | tests/vsynth2 tests/data/asynth1.sw: tests/audiogen$(HOSTEXESUF) | tests/data $(M)./$< $@ -tests/data/asynth-%.sw \ tests/data/asynth-%.wav: tests/audiogen$(HOSTEXESUF) | tests/data $(M)./$< $@ $(subst -, ,$*) diff --git a/tests/codec-regression.sh b/tests/codec-regression.sh index 51d1b4c67b..9fab2cd2e9 100755 --- a/tests/codec-regression.sh +++ b/tests/codec-regression.sh @@ -17,7 +17,7 @@ do_avconv $raw_ref -f image2 -vcodec pgmyuv -i $raw_src -an -f rawvideo fi if [ -n "$do_aref" ]; then do_avconv $pcm_ref -b 128k -ac 2 -ar 44100 -f s16le -i $pcm_src -f wav -do_avconv $pcm_ref_1ch -b 128k -ac 1 -ar 16000 -f s16le -i $pcm_src_1ch -f wav +do_avconv $pcm_ref_1ch -b 128k -i $pcm_src_1ch -f wav fi if [ -n "$do_cljr" ] ; then diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh index 51e7ac4d39..3162636c09 100755 --- a/tests/regression-funcs.sh +++ b/tests/regression-funcs.sh @@ -28,7 +28,7 @@ raw_ref="$datadir/$test_ref.ref.yuv" pcm_src="$target_datadir/asynth1.sw" pcm_dst="$datadir/$this.out.wav" pcm_ref="$datadir/$test_ref.ref.wav" -pcm_src_1ch="$target_datadir/asynth-16000-1.sw" +pcm_src_1ch="$target_datadir/asynth-16000-1.wav" pcm_ref_1ch="$datadir/$test_ref-16000-1.ref.wav" crcfile="$datadir/$this.crc" target_crcfile="$target_datadir/$this.crc" |