From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id D39F33858D37 for ; Tue, 20 Sep 2022 07:40:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D39F33858D37 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1663659655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=4BrLdnbMnst0IB2bMLjtPMi2Ms6JPsXcZFyIzWhR00I=; b=J5gwOB/upiYvXWLhAt//Q4Ptc4g6bGab06Ton6+uUbM/FoRxoyan9A7YjCUZQng+td7xS3 wxiBHBh+YTu9ga2D6AddMhrRP7wf0H/MIyWP8ORKPal+XHF//rs0oUZ3TuZn9BVt60mAwn tXS60q7zpBrU4dzc3qB0gg/pqCJqMP4= Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-456-HxXlbqmJPS25aOD5rrSlnA-1; Tue, 20 Sep 2022 03:40:54 -0400 X-MC-Unique: HxXlbqmJPS25aOD5rrSlnA-1 Received: by mail-qt1-f197.google.com with SMTP id cb22-20020a05622a1f9600b0035bb51792d2so1252535qtb.5 for ; Tue, 20 Sep 2022 00:40:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:user-agent:message-id:date:organization:subject:to :from:x-gm-message-state:from:to:cc:subject:date; bh=4BrLdnbMnst0IB2bMLjtPMi2Ms6JPsXcZFyIzWhR00I=; b=moKvJuUWVfHEw2sGRMKvVWzWX3k2CHyhp6xb1OBPr2VFfQbrRaixU/2RhKl3YHHASw PArvQAB6RG9CKzoqVNq9h/QfzZQtsRtfnrdiVekYkNqo9TjF+Q9E9UnNA7j7uh6PNir/ oEBVoEdsHeURSWfKTRCi6yYqAmvP2vML9jbTtszAztxuYiDXi+znpwcjBrbHgegZCkrV 1xxqjQMjHFS2+bRJeT3kt5FOppp6B4Ww/ntiSKszqGj+uoX2m9s1MkGRsVE8fJZFHuqE m3pnUfrQeBCnhmZR289hlgyJ/ep6vmqwA9cLpgpiZy0EHf8g72BEDapLs9BcTNk/nXHZ hThA== X-Gm-Message-State: ACrzQf0XRGxz/B0RjX7/bL3npNSe7CEoCRzkAH4TVokow6utuhj2/aIL YhFXAI0xg5DGdl9CLOrs+L3feh9gSNJPo/JVGmx2DYLEQwv14I5JrBDkgUBYLMb6buiAlpS0Mfq a7Bjm2hv31JJDh1fq4loXWKByAPtrq2Wh05kdb0Fa3FcuW7Eawg+I0KC6T/P4ykuUPDL6 X-Received: by 2002:a0c:b309:0:b0:496:b6c7:bdb1 with SMTP id s9-20020a0cb309000000b00496b6c7bdb1mr18153376qve.34.1663659653589; Tue, 20 Sep 2022 00:40:53 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5W1mnP0OTgC0t+ByWFoFpUn8KTUgQCWVgPcyNzF1QtoUTyCF5szxT37zPLPJIEmZA9GBVrfw== X-Received: by 2002:a0c:b309:0:b0:496:b6c7:bdb1 with SMTP id s9-20020a0cb309000000b00496b6c7bdb1mr18153360qve.34.1663659653058; Tue, 20 Sep 2022 00:40:53 -0700 (PDT) Received: from localhost ([88.120.130.27]) by smtp.gmail.com with ESMTPSA id l67-20020a378946000000b006cbb8ca04f8sm550777qkd.40.2022.09.20.00.40.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 00:40:52 -0700 (PDT) Received: by localhost (Postfix, from userid 1000) id 041CF581C2F; Tue, 20 Sep 2022 09:40:50 +0200 (CEST) From: Dodji Seketeli To: libabigail@sourceware.org Subject: [PATCH, applied] test-annotate: Don't emit architecture data Organization: Red Hat / France X-Operating-System: Fedora 38 X-URL: http://www.redhat.com Date: Tue, 20 Sep 2022 09:40:50 +0200 Message-ID: <87a66u7at9.fsf@redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Hello, When running runtestannotate on different architectures, some spurious test failures can happen because the resulting abixml contains the architecture of the original binary. This can be a problem for tests where the binary is compiled on the fly. We don't yet have those, but I was playing with some of these while debugging something else and stumbled across that issue. This patch thus removes mentions of the architecture of the binary, just like what runtestreaddwarf does. * tests/test-annotate.cc (main): Add the --no-architecture option to abidw. * tests/data/test-annotate/PR29443-missing-xx.o.annotated.abi: Adjust. * tests/data/test-annotate/libtest23.so.abi: Likewise. * tests/data/test-annotate/libtest24-drop-fns-2.so.abi: Likewise. * tests/data/test-annotate/libtest24-drop-fns.so.abi: Likewise. * tests/data/test-annotate/test-anonymous-members-0.o.abi: Likewise. * tests/data/test-annotate/test0.abi: Likewise. * tests/data/test-annotate/test1.abi: Likewise. * tests/data/test-annotate/test13-pr18894.so.abi: Likewise. * tests/data/test-annotate/test14-pr18893.so.abi: Likewise. * tests/data/test-annotate/test15-pr18892.so.abi: Likewise. * tests/data/test-annotate/test17-pr19027.so.abi: Likewise. * tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi: Likewise. * tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi: Likewise. * tests/data/test-annotate/test2.so.abi: Likewise. * tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi: Likewise. * tests/data/test-annotate/test21-pr19092.so.abi: Likewise. * tests/data/test-annotate/test3.so.abi: Likewise. * tests/data/test-annotate/test4.so.abi: Likewise. * tests/data/test-annotate/test5.o.abi: Likewise. * tests/data/test-annotate/test6.so.abi: Likewise. * tests/data/test-annotate/test7.so.abi: Likewise. * tests/data/test-annotate/test8-qualified-this-pointer.so.abi: Likewise. Signed-off-by: Dodji Seketeli --- tests/data/test-annotate/PR29443-missing-xx.o.annotated.abi | 2 +- tests/data/test-annotate/libtest23.so.abi | 2 +- tests/data/test-annotate/libtest24-drop-fns-2.so.abi | 2 +- tests/data/test-annotate/libtest24-drop-fns.so.abi | 2 +- tests/data/test-annotate/test-anonymous-members-0.o.abi | 2 +- tests/data/test-annotate/test0.abi | 2 +- tests/data/test-annotate/test1.abi | 2 +- tests/data/test-annotate/test13-pr18894.so.abi | 2 +- tests/data/test-annotate/test14-pr18893.so.abi | 2 +- tests/data/test-annotate/test15-pr18892.so.abi | 2 +- tests/data/test-annotate/test17-pr19027.so.abi | 2 +- .../test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi | 2 +- .../test19-pr19023-libtcmalloc_and_profiler.so.abi | 2 +- tests/data/test-annotate/test2.so.abi | 2 +- .../test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi | 2 +- tests/data/test-annotate/test21-pr19092.so.abi | 2 +- tests/data/test-annotate/test3.so.abi | 2 +- tests/data/test-annotate/test4.so.abi | 2 +- tests/data/test-annotate/test5.o.abi | 2 +- tests/data/test-annotate/test6.so.abi | 2 +- tests/data/test-annotate/test7.so.abi | 2 +- tests/data/test-annotate/test8-qualified-this-pointer.so.abi | 2 +- tests/test-annotate.cc | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/tests/data/test-annotate/PR29443-missing-xx.o.annotated.abi b/tests/data/test-annotate/PR29443-missing-xx.o.annotated.abi index dde6a745..74d33acb 100644 --- a/tests/data/test-annotate/PR29443-missing-xx.o.annotated.abi +++ b/tests/data/test-annotate/PR29443-missing-xx.o.annotated.abi @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-annotate/libtest23.so.abi b/tests/data/test-annotate/libtest23.so.abi index 1b7424e2..102fafad 100644 --- a/tests/data/test-annotate/libtest23.so.abi +++ b/tests/data/test-annotate/libtest23.so.abi @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-annotate/libtest24-drop-fns-2.so.abi b/tests/data/test-annotate/libtest24-drop-fns-2.so.abi index 11f8a916..84b2c57b 100644 --- a/tests/data/test-annotate/libtest24-drop-fns-2.so.abi +++ b/tests/data/test-annotate/libtest24-drop-fns-2.so.abi @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-annotate/libtest24-drop-fns.so.abi b/tests/data/test-annotate/libtest24-drop-fns.so.abi index 11f8a916..84b2c57b 100644 --- a/tests/data/test-annotate/libtest24-drop-fns.so.abi +++ b/tests/data/test-annotate/libtest24-drop-fns.so.abi @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-annotate/test-anonymous-members-0.o.abi b/tests/data/test-annotate/test-anonymous-members-0.o.abi index ae3ae917..91d309c8 100644 --- a/tests/data/test-annotate/test-anonymous-members-0.o.abi +++ b/tests/data/test-annotate/test-anonymous-members-0.o.abi @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-annotate/test0.abi b/tests/data/test-annotate/test0.abi index aed6b1ea..34bc8047 100644 --- a/tests/data/test-annotate/test0.abi +++ b/tests/data/test-annotate/test0.abi @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-annotate/test1.abi b/tests/data/test-annotate/test1.abi index 52a87250..54e66179 100644 --- a/tests/data/test-annotate/test1.abi +++ b/tests/data/test-annotate/test1.abi @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-annotate/test13-pr18894.so.abi b/tests/data/test-annotate/test13-pr18894.so.abi index addb886e..98c91663 100644 --- a/tests/data/test-annotate/test13-pr18894.so.abi +++ b/tests/data/test-annotate/test13-pr18894.so.abi @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-annotate/test14-pr18893.so.abi b/tests/data/test-annotate/test14-pr18893.so.abi index 919ae082..2481d592 100644 --- a/tests/data/test-annotate/test14-pr18893.so.abi +++ b/tests/data/test-annotate/test14-pr18893.so.abi @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-annotate/test15-pr18892.so.abi b/tests/data/test-annotate/test15-pr18892.so.abi index 6d71ed97..5f53943e 100644 --- a/tests/data/test-annotate/test15-pr18892.so.abi +++ b/tests/data/test-annotate/test15-pr18892.so.abi @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-annotate/test17-pr19027.so.abi b/tests/data/test-annotate/test17-pr19027.so.abi index 2f855f6e..f1f22a58 100644 --- a/tests/data/test-annotate/test17-pr19027.so.abi +++ b/tests/data/test-annotate/test17-pr19027.so.abi @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi b/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi index a04af5d6..328c8d7a 100644 --- a/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi +++ b/tests/data/test-annotate/test18-pr19037-libvtkRenderingLIC-6.1.so.abi @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi b/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi index 363a32d1..a52f9f7e 100644 --- a/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi +++ b/tests/data/test-annotate/test19-pr19023-libtcmalloc_and_profiler.so.abi @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-annotate/test2.so.abi b/tests/data/test-annotate/test2.so.abi index ba5e8a3f..3dc09be8 100644 --- a/tests/data/test-annotate/test2.so.abi +++ b/tests/data/test-annotate/test2.so.abi @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi b/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi index b2016e79..a17ecc39 100644 --- a/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi +++ b/tests/data/test-annotate/test20-pr19025-libvtkParallelCore-6.1.so.abi @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-annotate/test21-pr19092.so.abi b/tests/data/test-annotate/test21-pr19092.so.abi index befbb376..c6266871 100644 --- a/tests/data/test-annotate/test21-pr19092.so.abi +++ b/tests/data/test-annotate/test21-pr19092.so.abi @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-annotate/test3.so.abi b/tests/data/test-annotate/test3.so.abi index 37ee0e47..3da43791 100644 --- a/tests/data/test-annotate/test3.so.abi +++ b/tests/data/test-annotate/test3.so.abi @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-annotate/test4.so.abi b/tests/data/test-annotate/test4.so.abi index 7913e324..2e7a47f4 100644 --- a/tests/data/test-annotate/test4.so.abi +++ b/tests/data/test-annotate/test4.so.abi @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-annotate/test5.o.abi b/tests/data/test-annotate/test5.o.abi index 86bcf937..38655f74 100644 --- a/tests/data/test-annotate/test5.o.abi +++ b/tests/data/test-annotate/test5.o.abi @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-annotate/test6.so.abi b/tests/data/test-annotate/test6.so.abi index e4ee3be4..aa22f841 100644 --- a/tests/data/test-annotate/test6.so.abi +++ b/tests/data/test-annotate/test6.so.abi @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-annotate/test7.so.abi b/tests/data/test-annotate/test7.so.abi index a33fdd73..ea7ee86c 100644 --- a/tests/data/test-annotate/test7.so.abi +++ b/tests/data/test-annotate/test7.so.abi @@ -1,4 +1,4 @@ - + diff --git a/tests/data/test-annotate/test8-qualified-this-pointer.so.abi b/tests/data/test-annotate/test8-qualified-this-pointer.so.abi index 0e763405..117451c4 100644 --- a/tests/data/test-annotate/test8-qualified-this-pointer.so.abi +++ b/tests/data/test-annotate/test8-qualified-this-pointer.so.abi @@ -1,4 +1,4 @@ - + diff --git a/tests/test-annotate.cc b/tests/test-annotate.cc index b8a1ee75..f01fe6db 100644 --- a/tests/test-annotate.cc +++ b/tests/test-annotate.cc @@ -153,7 +153,7 @@ main() string abidw; abidw = string(get_build_dir()) + "/tools/abidw " - "--annotate --no-corpus-path"; + "--annotate --no-corpus-path --no-architecture"; for (InOutSpec* s = in_out_specs; s->in_elf_path; ++s) { bool is_ok = true; -- 2.37.2 -- Dodji