summaryrefslogtreecommitdiff
path: root/tests/regression-funcs.sh
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2011-06-19 16:19:06 +0100
committerMans Rullgard <mans@mansr.com>2011-06-21 12:37:58 +0100
commitea57502c82a91362daeafec392375706fa266d8b (patch)
treefa4d240bfe4c8b63196d69f6c81c5174c6bad2c3 /tests/regression-funcs.sh
parente6c52cee541ba23a7aec525f72dff73c188dad06 (diff)
fate: remove output redirections from old regtest scripts
All tests are run through the fate-run.sh script which already sets up redirections. Using the outputs set there simplifies things somewhat. Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'tests/regression-funcs.sh')
-rwxr-xr-xtests/regression-funcs.sh23
1 files changed, 8 insertions, 15 deletions
diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh
index e57cdf111e..979157bcf9 100755
--- a/tests/regression-funcs.sh
+++ b/tests/regression-funcs.sh
@@ -15,10 +15,7 @@ datadir="./tests/data"
target_datadir="${target_path}/${datadir}"
this="$test.$test_ref"
-logdir="$datadir/regression/$test_ref"
-logfile="$logdir/$test"
outfile="$datadir/$test_ref/"
-errfile="$datadir/$this.err"
# various files
ffmpeg="$target_exec ${target_path}/ffmpeg"
@@ -37,12 +34,8 @@ trap 'rm -f -- $cleanfiles' EXIT
mkdir -p "$datadir"
mkdir -p "$outfile"
-mkdir -p "$logdir"
-
-(exec >&3) 2>/dev/null || exec 3>&2
[ "${V-0}" -gt 0 ] && echov=echov || echov=:
-[ "${V-0}" -gt 1 ] || exec 2>$errfile
echov(){
echo "$@" >&3
@@ -67,13 +60,13 @@ do_ffmpeg()
shift
set -- $* ${target_path}/$f
run_ffmpeg $*
- do_md5sum $f >> $logfile
+ do_md5sum $f
if [ $f = $raw_dst ] ; then
- $tiny_psnr $f $raw_ref >> $logfile
+ $tiny_psnr $f $raw_ref
elif [ $f = $pcm_dst ] ; then
- $tiny_psnr $f $pcm_ref 2 >> $logfile
+ $tiny_psnr $f $pcm_ref 2
else
- wc -c $f >> $logfile
+ wc -c $f
fi
}
@@ -84,11 +77,11 @@ do_ffmpeg_nomd5()
set -- $* ${target_path}/$f
run_ffmpeg $*
if [ $f = $raw_dst ] ; then
- $tiny_psnr $f $raw_ref >> $logfile
+ $tiny_psnr $f $raw_ref
elif [ $f = $pcm_dst ] ; then
- $tiny_psnr $f $pcm_ref 2 >> $logfile
+ $tiny_psnr $f $pcm_ref 2
else
- wc -c $f >> $logfile
+ wc -c $f
fi
}
@@ -97,7 +90,7 @@ do_ffmpeg_crc()
f="$1"
shift
run_ffmpeg $* -f crc "$target_crcfile"
- echo "$f $(cat $crcfile)" >> $logfile
+ echo "$f $(cat $crcfile)"
}
do_video_decoding()