ffmpeg | branch: master | Clément Bœsch <cboe...@gopro.com> | Fri May 5 10:32:52 2017 +0200| [ed1fe7b2feeb914750ffca2ed030738b3cdc4858] | committer: Clément Bœsch
Merge commit '5c83b4d550ea42653fece092987bab56ccc32ead' * commit '5c83b4d550ea42653fece092987bab56ccc32ead': fate: Unset the sig variable if ignoring a test failure Merged-by: Clément Bœsch <cboe...@gopro.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ed1fe7b2feeb914750ffca2ed030738b3cdc4858 --- tests/fate-run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 0cf31e9477..c61852caa6 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -364,7 +364,7 @@ if test -e "$ref" || test $cmp = "oneline" || test $cmp = "grep" ; then cmperr=$? test $err = 0 && err=$cmperr if [ "$report_type" = "ignore" ]; then - test $err = 0 || echo "IGNORE fate-${test}" && err=0 + test $err = 0 || echo "IGNORE fate-${test}" && err=0 && unset sig else test $err = 0 || cat $cmpfile fi ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
