From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0B6B3A00C2 for ; Thu, 3 Nov 2022 16:47:28 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 02CF942D13; Thu, 3 Nov 2022 16:47:28 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 24C8542D11 for ; Thu, 3 Nov 2022 16:47:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667490446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LWW8PxfQ40jStjBcBNfNeNORRFTUGOyLX7oPiiImEQk=; b=ch2ymM8YOPDTKpAFzJ6QIEDlNKoCHJt8jqI/5E2ymHJw8ov/7FTt+T+8mdNxjlNhFHQCdN gPlCIHiMBotB1xLhc9CDUNxkn2CzvvDtvyuQM163VvQ4WWdejyTIG9TFJJHijlj7MCfz3E KSccwaWSDDK3nKB7SrGLBD6zgzb6/TM= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-96-_itnaAEANfuqam-aOdz2WA-1; Thu, 03 Nov 2022 11:47:25 -0400 X-MC-Unique: _itnaAEANfuqam-aOdz2WA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 46DC8380664D; Thu, 3 Nov 2022 15:47:25 +0000 (UTC) Received: from fchome.redhat.com (ovpn-193-221.brq.redhat.com [10.40.193.221]) by smtp.corp.redhat.com (Postfix) with ESMTP id 765B71121319; Thu, 3 Nov 2022 15:47:24 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: thomas@monjalon.net, ci@dpdk.org Subject: [PATCH 1/2] devtools: unify configuration for ABI check Date: Thu, 3 Nov 2022 16:47:16 +0100 Message-Id: <20221103154717.22368-2-david.marchand@redhat.com> In-Reply-To: <20221103154717.22368-1-david.marchand@redhat.com> References: <20221103154717.22368-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: ci@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK CI discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ci-bounces@dpdk.org We have been skipping removed libraries in the ABI check by updating the check-abi.sh script itself. See, for example, commit 33584c19ddc2 ("raw/dpaa2_qdma: remove driver"). Having two places for exception is a bit confusing, and those exceptions are best placed in a single configuration file out of the check script. Besides, a next patch will switch the check from comparing ABI xml files to directly comparing .so files. In this mode, libabigail does not support the soname_regexp syntax used for the mlx glue libraries. Let's handle these special cases in libabigail.abignore using comments. Taking the raw/dpaa2_qdma driver as an example, it would be possible to skip it by adding: ; SKIP_LIBRARY=librte_net_mlx4_glue +; SKIP_LIBRARY=librte_raw_dpaa2_qdma Signed-off-by: David Marchand --- devtools/check-abi.sh | 4 ++++ devtools/libabigail.abignore | 12 +++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/devtools/check-abi.sh b/devtools/check-abi.sh index c583eae2fd..b1bf633f2a 100755 --- a/devtools/check-abi.sh +++ b/devtools/check-abi.sh @@ -37,6 +37,10 @@ fi error= for dump in $(find $refdir -name "*.dump"); do name=$(basename $dump) + if grep -q "; SKIP_LIBRARY=${name%.dump}\>" $(dirname $0)/libabigail.abignore; then + echo "Skipped $name" >&2 + continue + fi dump2=$(find $newdir -name $name) if [ -z "$dump2" ] || [ ! -e "$dump2" ]; then echo "Error: cannot find $name in $newdir" >&2 diff --git a/devtools/libabigail.abignore b/devtools/libabigail.abignore index 7a93de3ba1..3ff51509de 100644 --- a/devtools/libabigail.abignore +++ b/devtools/libabigail.abignore @@ -16,9 +16,15 @@ [suppress_variable] name_regexp = _pmd_info$ -; Ignore changes on soname for mlx glue internal drivers -[suppress_file] - soname_regexp = ^librte_.*mlx.*glue\. +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; Special rules to skip libraries ; +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +; +; This is not a libabigail rule (see check-abi.sh). +; This is used for driver removal and other special cases like mlx glue libs. +; +; SKIP_LIBRARY=librte_common_mlx5_glue +; SKIP_LIBRARY=librte_net_mlx4_glue ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; Experimental APIs exceptions ; -- 2.38.1