From patchwork Tue Oct 3 09:40:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dodji Seketeli X-Patchwork-Id: 77005 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 3EB0C3858D35 for ; Tue, 3 Oct 2023 09:40:25 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3EB0C3858D35 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1696326025; bh=Wn19DMqj7pQp6GxZqX8zrZ7R4WJk7c5XbzGpvSB9j3k=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Help: List-Subscribe:From:Reply-To:From; b=pF3myS/W0YchYFGZYtXLOMC9LAC5wTP3L7Lbbg/+jNNd7Vj4Cr+xhDppraU+p+LsI Zgi4IIHT1k3w/WDB8miZ6sE2vyb1GIFSG7kcqZD8S7SAHBD2dd0/rvf1avSSRu6KTc fWnkprtE1zy78OWMdNZOAmQiHDXiBjZLPnIG+jeo= 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.129.124]) by sourceware.org (Postfix) with ESMTPS id 68AE73858D28 for ; Tue, 3 Oct 2023 09:40:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 68AE73858D28 Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-681-RtJ2X0ivM7qAGVeUKpvnwA-1; Tue, 03 Oct 2023 05:40:17 -0400 X-MC-Unique: RtJ2X0ivM7qAGVeUKpvnwA-1 Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-774105f6fb1so88371185a.3 for ; Tue, 03 Oct 2023 02:40:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696326017; x=1696930817; 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=Wn19DMqj7pQp6GxZqX8zrZ7R4WJk7c5XbzGpvSB9j3k=; b=GGFQlTqy+dYbFpIdRbAyzJ9JV1ANXo2Mj6L34Njrvi6mR4paZ2/OE1Y5LZH5nAG/fL qtC7J+3GWzAjnu8zLnC6cV+iapr7y7x6e9dk0BJJ/C4ws+Hrgo+P7YXiPhIrUkOJDZM4 Li7oviS+tZXXOovstFQ/yacz850NhL11IibFjE8W5pCVY74a9NxNSUrUVENZ/kJXMhMb UN/utfUUaASmniQqnm2+ow7gRiWf18ZVpne+fojLuMITLN6hRaAhQg5hHCTOc05MNhKw mgPCf1F7izODbqsWNSYxepjDmfseJNJoKqXkZ+nA4AJpBElL3wKhV2C+nV3nXJM5K3Y+ KyPw== X-Gm-Message-State: AOJu0YwPGEWrxxab2EWmFFVMtDhxFytIbjj/HRdxL7I7xo8jdkp61ARS Z1vaUTX5kKO2qJzbsA4RZVSqvMe2yvzf2iLVVPnF40U931PXrUK+a7xlgYl/q6oanxdQ4kiysHe 3GeP6USrPIf/GEew9bvJCgXhcFbKsEZLUh/sFwOdch1l7Gb3iNihe7JKAVbYdvNevr0Q8riwicy +v X-Received: by 2002:a05:620a:2089:b0:76e:8403:8b2 with SMTP id e9-20020a05620a208900b0076e840308b2mr14197260qka.42.1696326016825; Tue, 03 Oct 2023 02:40:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHRDPDHL66/sqYLQQvGHAl2Q/XX7JueNrcau7Nw63TQIUShryYF0hsPn6QqCGEPm+kxmFUwhw== X-Received: by 2002:a05:620a:2089:b0:76e:8403:8b2 with SMTP id e9-20020a05620a208900b0076e840308b2mr14197249qka.42.1696326016371; Tue, 03 Oct 2023 02:40:16 -0700 (PDT) Received: from localhost ([88.120.130.27]) by smtp.gmail.com with ESMTPSA id p7-20020a0ccb87000000b0065b1e6c33dfsm336233qvk.18.2023.10.03.02.40.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Oct 2023 02:40:15 -0700 (PDT) Received: by localhost (Postfix, from userid 1000) id 2C781B6E87; Tue, 3 Oct 2023 11:40:13 +0200 (CEST) To: libabigail@sourceware.org Subject: [PATCH, applied] test-abidiff-exit: Do not use debuginfo dir when its empty Organization: Red Hat / France X-Operating-System: CentOS Stream release 9 X-URL: http://www.redhat.com Date: Tue, 03 Oct 2023 11:40:13 +0200 Message-ID: <87il7ogi2q.fsf@redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.2 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_H4, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_WEB, 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.30 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" From 528ed9fe557ec73e11a7d5c0c9a396cc0c972b1d Mon Sep 17 00:00:00 2001 From: Dodji Seketeli Date: Tue, 26 Sep 2023 09:35:53 +0200 Subject: If the debug info dir is empty in the input test specifier, the abidiff command should not add any --debug-info-dir{1,2} option. Fixed thus. * tests/test-abidiff-exit.cc (main): If debug info dir is empty in the input test specifier, do not try to use it in the abidiff command. Signed-off-by: Dodji Seketeli Applied to master. --- tests/test-abidiff-exit.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/test-abidiff-exit.cc b/tests/test-abidiff-exit.cc index a6d54e5c..e539242a 100644 --- a/tests/test-abidiff-exit.cc +++ b/tests/test-abidiff-exit.cc @@ -1092,8 +1092,12 @@ main() bool is_ok = true; in_elfv0_path = source_dir_prefix + s->in_elfv0_path; in_elfv1_path = source_dir_prefix + s->in_elfv1_path; - in_elfv0_debug_dir = source_dir_prefix + s->in_elfv0_debug_dir; - in_elfv1_debug_dir = source_dir_prefix + s->in_elfv1_debug_dir; + in_elfv0_debug_dir.clear(); + in_elfv1_debug_dir.clear(); + if (s->in_elfv0_debug_dir && strcmp(s->in_elfv0_debug_dir, "")) + in_elfv0_debug_dir = source_dir_prefix + s->in_elfv0_debug_dir; + if (s->in_elfv1_debug_dir && strcmp(s->in_elfv1_debug_dir, "")) + in_elfv1_debug_dir = source_dir_prefix + s->in_elfv1_debug_dir; in_elfv0_headers_dirs.clear(); in_elfv1_headers_dirs.clear(); in_elfv0_added_bins_dir.clear();