summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2004-10-28 10:30:05 +0000
committerMichael Niedermayer <michaelni@gmx.at>2004-10-28 10:30:05 +0000
commit37a007826e0ef283700158a8b22baf7398b69e39 (patch)
treebb18fb61e7e3984fd9bc105785031e34891cf10c /tests
parent61b262a90ae9a337875cba826bb89a35ab92f3d0 (diff)
downloadffmpeg-streaming-37a007826e0ef283700158a8b22baf7398b69e39.zip
ffmpeg-streaming-37a007826e0ef283700158a8b22baf7398b69e39.tar.gz
suppress uninerresting output
Originally committed as revision 3645 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'tests')
-rwxr-xr-xtests/regression.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/regression.sh b/tests/regression.sh
index 91d82eb..18f1191 100755
--- a/tests/regression.sh
+++ b/tests/regression.sh
@@ -98,7 +98,7 @@ do_ffmpeg()
shift
echo $ffmpeg -y -bitexact -dct_algo 1 -idct_algo 2 $*
$ffmpeg -y -bitexact -dct_algo 1 -idct_algo 2 -benchmark $* > $datadir/bench.tmp 2> /tmp/ffmpeg$$
- egrep -v "^(Stream|Press|Input|Output|frame| Stream| Duration)" /tmp/ffmpeg$$ || true
+ egrep -v "^(Stream|Press|Input|Output|frame| Stream| Duration|video:)" /tmp/ffmpeg$$ || true
rm -f /tmp/ffmpeg$$
do_md5sum $f >> $logfile
if [ $f = $raw_dst ] ; then
@@ -116,7 +116,7 @@ do_ffmpeg_crc()
shift
echo $ffmpeg -y -bitexact -dct_algo 1 -idct_algo 2 $* -f crc $datadir/ffmpeg.crc
$ffmpeg -y -bitexact -dct_algo 1 -idct_algo 2 $* -f crc $datadir/ffmpeg.crc > /tmp/ffmpeg$$ 2>&1
- egrep -v "^(Stream|Press|Input|Output|frame| Stream| Duration)" /tmp/ffmpeg$$ || true
+ egrep -v "^(Stream|Press|Input|Output|frame| Stream| Duration|video:|ffmpeg version| configuration| built)" /tmp/ffmpeg$$ || true
rm -f /tmp/ffmpeg$$
echo "$f `cat $datadir/ffmpeg.crc`" >> $logfile
}
@@ -127,7 +127,7 @@ do_ffmpeg_nocheck()
shift
echo $ffmpeg -y -bitexact -dct_algo 1 -idct_algo 2 $*
$ffmpeg -y -bitexact -dct_algo 1 -idct_algo 2 -benchmark $* > $datadir/bench.tmp 2> /tmp/ffmpeg$$
- egrep -v "^(Stream|Press|Input|Output|frame| Stream| Duration)" /tmp/ffmpeg$$ || true
+ egrep -v "^(Stream|Press|Input|Output|frame| Stream| Duration|video:)" /tmp/ffmpeg$$ || true
rm -f /tmp/ffmpeg$$
expr "`cat $datadir/bench.tmp`" : '.*utime=\(.*s\)' > $datadir/bench2.tmp
echo `cat $datadir/bench2.tmp` $f >> $benchfile
OpenPOWER on IntegriCloud