[Ffmpeg-cvslog] r7532 - trunk/tests/regression.sh
diego
subversion
Mon Jan 15 08:56:15 CET 2007
Author: diego
Date: Mon Jan 15 08:56:15 2007
New Revision: 7532
Modified:
trunk/tests/regression.sh
Log:
Revert broken removal of variable indirection.
Modified: trunk/tests/regression.sh
==============================================================================
--- trunk/tests/regression.sh (original)
+++ trunk/tests/regression.sh Mon Jan 15 08:56:15 2007
@@ -116,42 +116,45 @@
do_ffmpeg()
{
+ f="$1"
shift
echo $ffmpeg $FFMPEG_OPTS $*
$ffmpeg $FFMPEG_OPTS -benchmark $* > $bench 2> /tmp/ffmpeg$$
egrep -v "^(Stream|Press|Input|Output|frame| Stream| Duration|video:)" /tmp/ffmpeg$$ || true
rm -f /tmp/ffmpeg$$
- do_md5sum $1 >> $logfile
- if [ $1 = $raw_dst ] ; then
- $tiny_psnr $1 $raw_ref >> $logfile
- elif [ $1 = $pcm_dst ] ; then
- $tiny_psnr $1 $pcm_ref 2 >> $logfile
+ do_md5sum $f >> $logfile
+ if [ $f = $raw_dst ] ; then
+ $tiny_psnr $f $raw_ref >> $logfile
+ elif [ $f = $pcm_dst ] ; then
+ $tiny_psnr $f $pcm_ref 2 >> $logfile
else
- wc -c $1 >> $logfile
+ wc -c $f >> $logfile
fi
expr "`cat $bench`" : '.*utime=\(.*s\)' > $bench2
- echo `cat $bench2` $1 >> $benchfile
+ echo `cat $bench2` $f >> $benchfile
}
do_ffmpeg_crc()
{
+ f="$1"
shift
echo $ffmpeg $FFMPEG_OPTS $* -f crc $datadir/ffmpeg.crc
$ffmpeg $FFMPEG_OPTS $* -f crc $datadir/ffmpeg.crc > /tmp/ffmpeg$$ 2>&1
egrep -v "^(Stream|Press|Input|Output|frame| Stream| Duration|video:|ffmpeg version| configuration| built)" /tmp/ffmpeg$$ || true
rm -f /tmp/ffmpeg$$
- echo "$1 `cat $datadir/ffmpeg.crc`" >> $logfile
+ echo "$f `cat $datadir/ffmpeg.crc`" >> $logfile
}
do_ffmpeg_nocheck()
{
+ f="$1"
shift
echo $ffmpeg $FFMPEG_OPTS $*
$ffmpeg $FFMPEG_OPTS -benchmark $* > $bench 2> /tmp/ffmpeg$$
egrep -v "^(Stream|Press|Input|Output|frame| Stream| Duration|video:)" /tmp/ffmpeg$$ || true
rm -f /tmp/ffmpeg$$
expr "`cat $bench`" : '.*utime=\(.*s\)' > $bench2
- echo `cat $bench2` $1 >> $benchfile
+ echo `cat $bench2` $f >> $benchfile
}
do_video_decoding()
More information about the ffmpeg-cvslog
mailing list