summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2015-04-23 04:27:56 +0200
committerMichael Niedermayer <[email protected]>2015-05-21 20:43:37 +0200
commit3afb2653bdaa5b785e9af8bdd7f7d9e48abb0eb4 (patch)
tree7937fba6d9109d9a81dfac2466255fef36ceb092
parent4c01572a9480da7d4a7d7c3fd850cc23e94d6ca1 (diff)
tests/fate-run: do not attempt to parse tiny_psnrs output if it failed
This avoids confusing syntax errors with awk later Likely fixes awk errors at: http://buildd.debian-ports.org/status/fetch.php?pkg=ffmpeg&arch=sparc64&ver=7%3A2.6.2-1&stamp=1428928967 Reviewed-by: Timothy Gu <[email protected]> Thanks-to: Andreas Cadhalpun <[email protected]> for the link Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit c0d847e457c1ef72843a63853f1135d52b74131e) Signed-off-by: Michael Niedermayer <[email protected]>
-rwxr-xr-xtests/fate-run.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 824d5f48d1..ed36a68440 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -42,7 +42,7 @@ compare(){
}
do_tiny_psnr(){
- psnr=$(tests/tiny_psnr "$1" "$2" $cmp_unit $cmp_shift 0)
+ psnr=$(tests/tiny_psnr "$1" "$2" $cmp_unit $cmp_shift 0) || return 1
val=$(expr "$psnr" : ".*$3: *\([0-9.]*\)")
size1=$(expr "$psnr" : '.*bytes: *\([0-9]*\)')
size2=$(expr "$psnr" : '.*bytes:[ 0-9]*/ *\([0-9]*\)')