fate: Unset the sig variable if ignoring a test failure

Message ID 20161228222030.93030-1-martin@martin.st
State Committed
Commit 5c83b4d550ea42653fece092987bab56ccc32ead
Headers show

Commit Message

Martin Storsjö Dec. 28, 2016, 10:20 p.m.
Otherwise the .rep file would still contain a signal instead of a
zero, even if the process returned success.
---
Also, I think the fate- prefix should be omitted in the IGNORE line.
See https://fate.libav.org/i386-apple-darwin-gcc-4.0/20161228201333/test
for an example of what it looks like.

And instead of "IGNORE  " with double spaces, I think the more
correct/consistent thing to use would be a \t, to match what the makefiles
use for the CC etc lines.
---
 tests/fate-run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Luca Barbato Dec. 29, 2016, 12:24 a.m. | #1
On 28/12/2016 23:20, Martin Storsjö wrote:
> Otherwise the .rep file would still contain a signal instead of a
> zero, even if the process returned success.
> ---
> Also, I think the fate- prefix should be omitted in the IGNORE line.
> See https://fate.libav.org/i386-apple-darwin-gcc-4.0/20161228201333/test
> for an example of what it looks like.
> 
> And instead of "IGNORE  " with double spaces, I think the more
> correct/consistent thing to use would be a \t, to match what the makefiles
> use for the CC etc lines.
> ---
>  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 27cd626..e1aaf64 100755
> --- a/tests/fate-run.sh
> +++ b/tests/fate-run.sh
> @@ -214,7 +214,7 @@ if test -e "$ref" || test $cmp = "oneline" ; 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
> 

Possibly Ok.
Diego Biurrun Dec. 29, 2016, 1:28 p.m. | #2
On Thu, Dec 29, 2016 at 12:20:30AM +0200, Martin Storsjö wrote:
> Otherwise the .rep file would still contain a signal instead of a
> zero, even if the process returned success.
> ---
> Also, I think the fate- prefix should be omitted in the IGNORE line.
> See https://fate.libav.org/i386-apple-darwin-gcc-4.0/20161228201333/test
> for an example of what it looks like.
> 
> And instead of "IGNORE  " with double spaces, I think the more
> correct/consistent thing to use would be a \t, to match what the makefiles
> use for the CC etc lines.
> ---
>  tests/fate-run.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

OK

Diego

Patch

diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 27cd626..e1aaf64 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -214,7 +214,7 @@  if test -e "$ref" || test $cmp = "oneline" ; 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