Commit f3885b7a authored by mru's avatar mru

regtest: do not write to /tmp/ffmpeg$$

Nothing useful was ever written to this file.  It did, however,
often cause spurious failures when the file was left behind by
another user on the system.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@19938 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent ae1f64b1
...@@ -45,7 +45,7 @@ else ...@@ -45,7 +45,7 @@ else
do_md5sum() { echo No md5sum program found; } do_md5sum() { echo No md5sum program found; }
fi fi
FFMPEG_OPTS="-y -flags +bitexact -dct fastint -idct simple -sws_flags +accurate_rnd+bitexact" FFMPEG_OPTS="-v 0 -y -flags +bitexact -dct fastint -idct simple -sws_flags +accurate_rnd+bitexact"
do_ffmpeg() do_ffmpeg()
{ {
...@@ -53,9 +53,7 @@ do_ffmpeg() ...@@ -53,9 +53,7 @@ do_ffmpeg()
shift shift
set -- $* ${target_path}/$f set -- $* ${target_path}/$f
echo $ffmpeg $FFMPEG_OPTS $* echo $ffmpeg $FFMPEG_OPTS $*
$ffmpeg $FFMPEG_OPTS -benchmark $* > $bench 2> /tmp/ffmpeg$$ $ffmpeg $FFMPEG_OPTS -benchmark $* > $bench
egrep -v "^(Stream|Press|Input|Output|frame| Stream| Duration|video:)" /tmp/ffmpeg$$ || true
rm -f /tmp/ffmpeg$$
do_md5sum $f >> $logfile do_md5sum $f >> $logfile
if [ $f = $raw_dst ] ; then if [ $f = $raw_dst ] ; then
$tiny_psnr $f $raw_ref >> $logfile $tiny_psnr $f $raw_ref >> $logfile
...@@ -74,9 +72,7 @@ do_ffmpeg_nomd5() ...@@ -74,9 +72,7 @@ do_ffmpeg_nomd5()
shift shift
set -- $* ${target_path}/$f set -- $* ${target_path}/$f
echo $ffmpeg $FFMPEG_OPTS $* echo $ffmpeg $FFMPEG_OPTS $*
$ffmpeg $FFMPEG_OPTS -benchmark $* > $bench 2> /tmp/ffmpeg$$ $ffmpeg $FFMPEG_OPTS -benchmark $* > $bench
egrep -v "^(Stream|Press|Input|Output|frame| Stream| Duration|video:)" /tmp/ffmpeg$$ || true
rm -f /tmp/ffmpeg$$
if [ $f = $raw_dst ] ; then if [ $f = $raw_dst ] ; then
$tiny_psnr $f $raw_ref >> $logfile $tiny_psnr $f $raw_ref >> $logfile
elif [ $f = $pcm_dst ] ; then elif [ $f = $pcm_dst ] ; then
...@@ -93,9 +89,7 @@ do_ffmpeg_crc() ...@@ -93,9 +89,7 @@ do_ffmpeg_crc()
f="$1" f="$1"
shift shift
echo $ffmpeg $FFMPEG_OPTS $* -f crc "$target_crcfile" echo $ffmpeg $FFMPEG_OPTS $* -f crc "$target_crcfile"
$ffmpeg $FFMPEG_OPTS $* -f crc "$target_crcfile" > /tmp/ffmpeg$$ 2>&1 $ffmpeg $FFMPEG_OPTS $* -f crc "$target_crcfile"
egrep -v "^(Stream|Press|Input|Output|frame| Stream| Duration|video:|ffmpeg version| configuration| built)" /tmp/ffmpeg$$ || true
rm -f /tmp/ffmpeg$$
echo "$f `cat $crcfile`" >> $logfile echo "$f `cat $crcfile`" >> $logfile
rm -f "$crcfile" rm -f "$crcfile"
} }
...@@ -105,9 +99,7 @@ do_ffmpeg_nocheck() ...@@ -105,9 +99,7 @@ do_ffmpeg_nocheck()
f="$1" f="$1"
shift shift
echo $ffmpeg $FFMPEG_OPTS $* echo $ffmpeg $FFMPEG_OPTS $*
$ffmpeg $FFMPEG_OPTS -benchmark $* > $bench 2> /tmp/ffmpeg$$ $ffmpeg $FFMPEG_OPTS -benchmark $* > $bench
egrep -v "^(Stream|Press|Input|Output|frame| Stream| Duration|video:)" /tmp/ffmpeg$$ || true
rm -f /tmp/ffmpeg$$
expr "`cat $bench`" : '.*utime=\(.*s\)' > $bench2 expr "`cat $bench`" : '.*utime=\(.*s\)' > $bench2
echo `cat $bench2` $f >> $benchfile echo `cat $bench2` $f >> $benchfile
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment