diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-06-07 22:36:39 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-06-07 22:36:39 +0000 |
| commit | 4fbd52f0b8fc8e2f5ae6b6f74e349961fa4761c1 (patch) | |
| tree | cdb11b63737941395f1d96d9f50032e54b2dc60c /tests/regression.sh | |
| parent | 46076a95a05a8862315df1f6f8e1db313f80c343 (diff) | |
Merge tests Makefile into the top-level Makefile.
This gets rid of some recursion and simplifies the code.
Originally committed as revision 9255 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'tests/regression.sh')
| -rwxr-xr-x | tests/regression.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/regression.sh b/tests/regression.sh index 7a7e95c6f3..85e296253e 100755 --- a/tests/regression.sh +++ b/tests/regression.sh @@ -19,7 +19,7 @@ fi set -e -datadir="./data" +datadir="./tests/data" logfile="$datadir/ffmpeg.regression" outfile="$datadir/a-" @@ -91,8 +91,8 @@ fi # various files -ffmpeg="../ffmpeg_g" -tiny_psnr="./tiny_psnr" +ffmpeg="./ffmpeg_g" +tiny_psnr="tests/tiny_psnr" reffile="$2" benchfile="$datadir/ffmpeg.bench" bench="$datadir/bench.tmp" @@ -100,7 +100,7 @@ bench2="$datadir/bench2.tmp" raw_src="$3/%02d.pgm" raw_dst="$datadir/out.yuv" raw_ref="$datadir/ref.yuv" -pcm_src="asynth1.sw" +pcm_src="tests/asynth1.sw" pcm_dst="$datadir/out.wav" pcm_ref="$datadir/ref.wav" if [ X"`echo | md5sum 2> /dev/null`" != X ]; then |