diff options
| author | Clément Bœsch <cboesch@gopro.com> | 2017-05-05 10:32:52 +0200 |
|---|---|---|
| committer | Clément Bœsch <cboesch@gopro.com> | 2017-05-05 10:32:52 +0200 |
| commit | ed1fe7b2feeb914750ffca2ed030738b3cdc4858 (patch) | |
| tree | 99dc69723e59a6fb6a1d141a607ecc154fbd40cb | |
| parent | ae68bb779ca7923197a7eafca8b0895d544b29f7 (diff) | |
| parent | 5c83b4d550ea42653fece092987bab56ccc32ead (diff) | |
| download | ffmpeg-ed1fe7b2feeb914750ffca2ed030738b3cdc4858.tar.gz | |
Merge commit '5c83b4d550ea42653fece092987bab56ccc32ead'
* commit '5c83b4d550ea42653fece092987bab56ccc32ead':
fate: Unset the sig variable if ignoring a test failure
Merged-by: Clément Bœsch <cboesch@gopro.com>
| -rwxr-xr-x | tests/fate-run.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |