diff options
| -rwxr-xr-x | tests/regression.sh | 4 | ||||
| -rwxr-xr-x | tests/server-regression.sh | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/regression.sh b/tests/regression.sh index d22a7b463f..227c413739 100755 --- a/tests/regression.sh +++ b/tests/regression.sh @@ -60,7 +60,9 @@ do_ffmpeg() f="$1" shift echo $ffmpeg -bitexact -dct_algo 1 -idct_algo 2 $* - $ffmpeg -bitexact -dct_algo 1 -idct_algo 2 -benchmark $* > $datadir/bench.tmp + $ffmpeg -bitexact -dct_algo 1 -idct_algo 2 -benchmark $* > $datadir/bench.tmp 2> /tmp/ffmpeg$$ + grep -v -e ^Stream -e ^Press -e ^Input -e ^Output -e ^frame -e '^ Stream' /tmp/ffmpeg$$ || true + rm -f /tmp/ffmpeg$$ md5sum -b $f >> $logfile if [ $f = $raw_dst ] ; then $tiny_psnr $f $raw_ref >> $logfile diff --git a/tests/server-regression.sh b/tests/server-regression.sh index db1edc11f8..8251999b2a 100755 --- a/tests/server-regression.sh +++ b/tests/server-regression.sh @@ -7,7 +7,7 @@ cp test.conf data/test.conf perl -e 'chomp($wd = `pwd`); print map { s!data/!!; "<Stream $_>\nFile $wd/data/$_\n</Stream>\n\n" } @ARGV' data/a* >> data/test.conf perl -e 'chomp($wd = `pwd`); print map { s!data/!!; "<Stream $_.asf>\nFile $wd/data/$_\n</Stream>\n\n" } @ARGV' data/a* >> data/test.conf -FILES=`perl -n -e 'print \$1, " " if /<stream\\s+(\\S+)>/i' data/test.conf` +FILES=`perl -n -e 'print \$1, " " if /<stream\\s+(\\S+)>/i' data/test.conf | sort` rm -f /tmp/feed.ffm ../ffserver -d -f data/test.conf 2> /dev/null & |