Re: ☺ Buildbot (GNU Toolchain): dwz - build successful (master)

[Mark Wielaard <mark@klomp.org>]

Hi Martin,

On Fri, Jul 01, 2022 at 08:42:00AM +0200, Martin Liška wrote:
> > So I think that should also be a passing condition (no decls left).
> > It would be good to make sure they were there at the start though.
> 
> Oh, I see, so please try the updated version of the patch?

Looks good to me. And makes the test PASS locally.

Thanks,

Mark

> From e08b4e361546d4db773b3948241b586fa5ea55d7 Mon Sep 17 00:00:00 2001
> From: Martin Liska <mliska@suse.cz>
> Date: Thu, 30 Jun 2022 16:21:58 +0200
> Subject: [PATCH] testsuite: verify directly merged DW_AT_declarations
> 
> Do not rely on number of DW_AT_declaration and check symbols
> instead.
> ---
>  testsuite/dwz.tests/odr-struct-ns.sh | 14 +++++++++-----
>  testsuite/dwz.tests/odr-struct.sh    | 14 +++++++++-----
>  2 files changed, 18 insertions(+), 10 deletions(-)
> 
> diff --git a/testsuite/dwz.tests/odr-struct-ns.sh b/testsuite/dwz.tests/odr-struct-ns.sh
> index 4fd00af..c6e0f1d 100644
> --- a/testsuite/dwz.tests/odr-struct-ns.sh
> +++ b/testsuite/dwz.tests/odr-struct-ns.sh
> @@ -21,7 +21,10 @@ for name in member_one member_two member_three member_four; do
>  	esac
>  done
>  
> -decl_cnt=$(readelf -wi 1 | grep -c "DW_AT_declaration" || true)
> +# Check that bbb and ccc are present as DW_AT_declaration
> +readelf -wi 1 | grep -3 DW_AT_declaration > decls
> +grep bbb decls >/dev/null
> +grep ccc decls >/dev/null
>  
>  $execs/dwz-for-test --odr 1
>  
> @@ -38,8 +41,9 @@ for name in member_one member_two member_three member_four; do
>  done
>  
>  # We expect two decls to be removed, for bbb and ccc.
> -expected_decl_cnt=$(($decl_cnt - 2))
> -decl_cnt=$(readelf -wi 1 | grep -c "DW_AT_declaration" || true)
> -[ $expected_decl_cnt -eq $decl_cnt ]
> +readelf -wi 1 | grep -3 DW_AT_declaration > decls || true
>  
> -rm -f 1
> +if grep bbb decls >/dev/null ; then exit 1; fi
> +if grep ccc decls >/dev/null ; then exit 2; fi
> +
> +rm -f 1 decls
> diff --git a/testsuite/dwz.tests/odr-struct.sh b/testsuite/dwz.tests/odr-struct.sh
> index d0fddf9..c6793f9 100644
> --- a/testsuite/dwz.tests/odr-struct.sh
> +++ b/testsuite/dwz.tests/odr-struct.sh
> @@ -21,7 +21,10 @@ for name in member_one member_two member_three member_four; do
>  	esac
>  done
>  
> -decl_cnt=$(readelf -wi 1 | grep -c "DW_AT_declaration" || true)
> +# Check that bbb and ccc are present as DW_AT_declaration
> +readelf -wi 1 | grep -3 DW_AT_declaration > decls
> +grep bbb decls >/dev/null
> +grep ccc decls >/dev/null
>  
>  $execs/dwz-for-test --odr 1
>  
> @@ -38,8 +41,9 @@ for name in member_one member_two member_three member_four; do
>  done
>  
>  # We expect two decls to be removed, for bbb and ccc.
> -expected_decl_cnt=$(($decl_cnt - 2))
> -decl_cnt=$(readelf -wi 1 | grep -c "DW_AT_declaration" || true)
> -[ $expected_decl_cnt -eq $decl_cnt ]
> +readelf -wi 1 | grep -3 DW_AT_declaration > decls || true
>  
> -rm -f 1
> +if grep bbb decls >/dev/null ; then exit 1; fi
> +if grep ccc decls >/dev/null ; then exit 2; fi
> +
> +rm -f 1 decls
> -- 
> 2.36.1
>