* Removed ffmpeg output during encoding runs. Now only print out errors

* Try to fix mysterious sort order issue in ffserver tests

Originally committed as revision 1775 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/tests/regression.sh b/tests/regression.sh
index d22a7b463fec1d87fe15f2c8fa590ccadc7102d5..227c413739ed0c807ebc47a795dd30aef13c8f65 100755 (executable)
--- 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 db1edc11f8f7b879b92683450e34a4dc2ff2da34..8251999b2a8e0847c92cf7401d0d7c621cc15167 100755 (executable)
--- 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 &