From patchwork Wed Apr 5 16:06:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dodji Seketeli X-Patchwork-Id: 67397 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0560E3858436 for ; Wed, 5 Apr 2023 16:06:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0560E3858436 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1680710795; bh=+8NF8oo7SRPp713D+lAnhyn8btYLklxKdopJMOIrjuA=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Help: List-Subscribe:From:Reply-To:From; b=S9A2L79hFIPza/aQ5SdUftZyBs31WNviHMhpXlVMT8t/dT97aIKDyucMeit9BTP5d 7twCj5nWiqSgLWYchKujG7vVFow6VI4N2rxpUdudf9WicIFjAkvVTHI1jW2M64GbNA caewT6s6QlL0mk6qw5XhudJB9S8n4xtjeeLNJ68Q= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org 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 6FB883858C50 for ; Wed, 5 Apr 2023 16:06:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6FB883858C50 Received: from mail-qv1-f71.google.com (mail-qv1-f71.google.com [209.85.219.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-228-B5ghSHs_PIO5DjE3XtmOlA-1; Wed, 05 Apr 2023 12:06:28 -0400 X-MC-Unique: B5ghSHs_PIO5DjE3XtmOlA-1 Received: by mail-qv1-f71.google.com with SMTP id g14-20020ad457ae000000b005aab630eb8eso16538376qvx.13 for ; Wed, 05 Apr 2023 09:06:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680710788; h=mime-version:user-agent:message-id:date:organization:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=+8NF8oo7SRPp713D+lAnhyn8btYLklxKdopJMOIrjuA=; b=xem/z+LxZFg0wfFqatCZCGtIj3+AP1c8oBEirr5kzpZ7/J6oNpDzSPjIVJFGfrnhU2 2h6ny6KiK649ZaDruI8VeiMxFYKOaER7J0/WvG6MJB4x3nuYVuFeyiNVPZ8vDJf0IC9k zCg+H/X2s7rfo1FDVqndE78tRDDRLWVxkKYMQbR3jm3mvcPAzkcqB5rByzdxxuwgeo8P 9aHEEOi71ymuMt3OdTn8Cj62BRUt2capebmLozvvaZwSmJRzBgNqPi47s4OdZB39Ip7p IKPvgmte+sDWXJhAnOv31d0Ze+qJ8wnGLxJcJ0iWYzgvJxv7qgUx/xJsFa8IhbhhITgc GHkg== X-Gm-Message-State: AAQBX9dr7i5R+NXsDUYKf/1kWUSO5fdQunEDTu6dUkvNa8D/PdjFdyzu b/EFWlue0YitpNXNygPIFG7FHQucKp0rZyyCn+/2/GBrDEJQijAw36NWbqOT49u+M0GaRawDcGV fqv69XlATWvgutXArZn1OnZKzUvwlnA3nav3xdbp6/qr9ITMgeWG0jOdaJgufDi+JxMufWBHI+9 jU X-Received: by 2002:ac8:5903:0:b0:3bf:d0b1:433d with SMTP id 3-20020ac85903000000b003bfd0b1433dmr5882958qty.60.1680710787708; Wed, 05 Apr 2023 09:06:27 -0700 (PDT) X-Google-Smtp-Source: AKy350azmwD4my224Q0zEEwAOjE7Hk9XeA/9r+z3y7raOCJJ4qaPJy1fz9C2CvWjetSO7BI3UcgK5g== X-Received: by 2002:ac8:5903:0:b0:3bf:d0b1:433d with SMTP id 3-20020ac85903000000b003bfd0b1433dmr5882897qty.60.1680710787218; Wed, 05 Apr 2023 09:06:27 -0700 (PDT) Received: from localhost ([88.120.130.27]) by smtp.gmail.com with ESMTPSA id s194-20020a37a9cb000000b007469b5bc2c4sm4560832qke.13.2023.04.05.09.06.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Apr 2023 09:06:26 -0700 (PDT) Received: by localhost (Postfix, from userid 1000) id 91BB9581C79; Wed, 5 Apr 2023 18:06:25 +0200 (CEST) To: libabigail@sourceware.org Subject: [PATCH, applied] abipkgdiff: Don't use user-specific filesystem info in error msg Organization: Red Hat / France X-Operating-System: Fedora 38 X-URL: http://www.redhat.com Date: Wed, 05 Apr 2023 18:06:25 +0200 Message-ID: <87lej6l3em.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 X-Spam-Status: No, score=-11.8 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_NONE, RCVD_IN_MSPIKE_H2, 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 X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list of the Libabigail project List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-Patchwork-Original-From: Dodji Seketeli via Libabigail From: Dodji Seketeli Reply-To: Dodji Seketeli Errors-To: libabigail-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libabigail" Hello, The recent patch "Bug rhbz#2182807 -- abipkgdiff crashes on missing debuginfo package" inadvertently introduced user-specific filesystem information in error messages, making tests/runtestdiffpkg be non-deterministic. Fixed thus. * tools/abipkgdiff.cc (get_pretty_printed_list_of_packages): Emit base names of packages, not the absolute filesystem path. * tests/data/test-diff-pkg/libxfce4ui-devel-4.12.1-8.fc27.ppc64-self-report-0.txt: Adjust. Signed-off-by: Dodji Seketeli --- .../libxfce4ui-devel-4.12.1-8.fc27.ppc64-self-report-0.txt | 2 +- tools/abipkgdiff.cc | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/data/test-diff-pkg/libxfce4ui-devel-4.12.1-8.fc27.ppc64-self-report-0.txt b/tests/data/test-diff-pkg/libxfce4ui-devel-4.12.1-8.fc27.ppc64-self-report-0.txt index 0188bc9b..951c66c7 100644 --- a/tests/data/test-diff-pkg/libxfce4ui-devel-4.12.1-8.fc27.ppc64-self-report-0.txt +++ b/tests/data/test-diff-pkg/libxfce4ui-devel-4.12.1-8.fc27.ppc64-self-report-0.txt @@ -1,6 +1,6 @@ abipkgdiff: ==== Error happened during processing of 'libxfce4uiglade.so' ==== abipkgdiff: could not find alternate debug info: -abipkgdiff: While reading elf file 'libxfce4uiglade.so', could not find alternate debug info in provided debug info package(s) '/home/dodji/git/libabigail/fixes/tests/data/test-diff-pkg/libxfce4ui-devel-debuginfo-4.12.1-8.fc27.ppc64.rpm' +abipkgdiff: While reading elf file 'libxfce4uiglade.so', could not find alternate debug info in provided debug info package(s) 'libxfce4ui-devel-debuginfo-4.12.1-8.fc27.ppc64.rpm' abipkgdiff: The alternate debug info file being looked for is: ../../../../.dwz/libxfce4ui-4.12.1-8.fc27.ppc64 abipkgdiff: You must provide the additional debug info package that contains that alternate debug info file, using an additional --d1/--d2 switch abipkgdiff: ==== End of error for 'libxfce4uiglade.so' ==== diff --git a/tools/abipkgdiff.cc b/tools/abipkgdiff.cc index d10706a9..69661c5b 100644 --- a/tools/abipkgdiff.cc +++ b/tools/abipkgdiff.cc @@ -2421,11 +2421,13 @@ get_pretty_printed_list_of_packages(const vector& packages) std::stringstream o; for (auto p : packages) { + string filename; + tools_utils::base_name(p, filename); if (need_comma) o << ", "; else need_comma = true; - o << "'" << p << "'"; + o << "'" << filename << "'"; } return o.str(); }