From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id F4019A04E6; Mon, 7 Dec 2020 18:33:21 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C64E1E07; Mon, 7 Dec 2020 18:33:20 +0100 (CET) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by dpdk.org (Postfix) with ESMTP id 2B4BECF3 for ; Mon, 7 Dec 2020 18:33:19 +0100 (CET) Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id C4A555C0228; Mon, 7 Dec 2020 12:33:17 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Mon, 07 Dec 2020 12:33:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; s=fm2; bh=ZhV9OLYqJcUdQQiaTyoXdXYlB+ TfwujSE91mdSb8Utc=; b=OIpBzQi6jOMEpNclIsCy//3mqVkEiyrVeCB3v/aWls abCuSTed2y6uRGItRh2wx0GYS3wbnTshsOzVpXaRV1uhC3pjS3VrsLBf6iPIqKpv yvDvZbflk7vWntupYbnnsY+I4P40mwOGclxh6xJEdF6M3JOe4VfcGBNPcy3hUHdh g/54ir54asiG05O4NaLjvz5e1pT3B7V7EbtFXFOtgAUfk63aq6OfbkDxKI5klG2+ w50U/RlooI4TPF/6oKOq8PpVazL7l3Yn9gDWYdP+Hc72PqbCSKww8snLDkorxvzF OuJeBhVzr0DoiSMHPDqMnZTvFTbSh+OYNGUOIhED5RlQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=ZhV9OLYqJcUdQQiaT yoXdXYlB+TfwujSE91mdSb8Utc=; b=n7X0Zweicxlo3D7dBXBGbBOYM5xVQxj+3 rZqHyiNrd4kCBKrBGeuBEBQz38XUqaaS2FbxRk4Kn4XSQmW7kCmn9qEC6monXbZr Ft221TJ0v4fmpnH3H0UQ3oLFeyfwH+lny2JnhXa+5r70rLMfjbK5ZiyBWMDl24WI ljvJWgq0j0sidPUgAtHfyum8BAyyvgrJ/VFZWrVBM7Zh4GPct55LpKr3z1R+eWf7 +doBhBoA0EL1fymgsGLCIPio1UiJBwxp0RFJt1C3m3d0GvQJOg/absGFINZOSeaF tRmk5vqHJRkrVlWtXBE0NF97uUvmSj5cIYo5La7C3kqnnDqvmhCGA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrudejgedguddtudcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd enucfjughrpefhvffufffkofgggfestdekredtredttdenucfhrhhomhepvfhhohhmrghs ucfoohhnjhgrlhhonhcuoehthhhomhgrshesmhhonhhjrghlohhnrdhnvghtqeenucggtf frrghtthgvrhhnpedvledvudehvdduudevuedvveehgeduleegiefgjeehudehtddtgedu ffejiefhgfenucfkphepjeejrddufeegrddvtdefrddukeegnecuvehluhhsthgvrhfuih iivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepthhhohhmrghssehmohhnjhgrlhho nhdrnhgvth X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id 6419C1080063; Mon, 7 Dec 2020 12:33:15 -0500 (EST) From: Thomas Monjalon To: dev@dpdk.org Cc: david.marchand@redhat.com, bruce.richardson@intel.com, Ray Kinsella , Neil Horman Date: Mon, 7 Dec 2020 18:32:35 +0100 Message-Id: <20201207173235.1397351-1-thomas@monjalon.net> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 1/1] devtools: adjust verbosity of ABI check X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The scripts gen-abi.sh and check-abi.sh are updated to print error messages to stderr so they are likely never ignored. When called from test-meson-builds.sh, the standard messages on stdout can be more quiet depending on the verbosity settings. The beginning of the ABI check is announced in verbose mode. The commands are printed in very verbose mode. The check result details are available in verbose mode. Signed-off-by: Thomas Monjalon --- devtools/check-abi.sh | 21 +++++++++++---------- devtools/gen-abi.sh | 4 ++-- devtools/test-meson-builds.sh | 9 +++++++-- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/devtools/check-abi.sh b/devtools/check-abi.sh index ab6748cfbc..381db2cdd1 100755 --- a/devtools/check-abi.sh +++ b/devtools/check-abi.sh @@ -3,7 +3,7 @@ # Copyright (c) 2019 Red Hat, Inc. if [ $# != 2 ] && [ $# != 3 ]; then - echo "Usage: $0 refdir newdir [warnonly]" + echo "Usage: $0 refdir newdir [warnonly]" >&2 exit 1 fi @@ -13,23 +13,23 @@ warnonly=${3:-} ABIDIFF_OPTIONS="--suppr $(dirname $0)/libabigail.abignore --no-added-syms" if [ ! -d $refdir ]; then - echo "Error: reference directory '$refdir' does not exist." + echo "Error: reference directory '$refdir' does not exist." >&2 exit 1 fi incdir=$(find $refdir -type d -a -name include) if [ -z "$incdir" ] || [ ! -e "$incdir" ]; then - echo "WARNING: could not identify a include directory for $refdir, expect false positives..." + echo "WARNING: could not identify an include directory for $refdir, expect false positives..." >&2 else ABIDIFF_OPTIONS="$ABIDIFF_OPTIONS --headers-dir1 $incdir" fi if [ ! -d $newdir ]; then - echo "Error: directory to check '$newdir' does not exist." + echo "Error: directory to check '$newdir' does not exist." >&2 exit 1 fi incdir2=$(find $newdir -type d -a -name include) if [ -z "$incdir2" ] || [ ! -e "$incdir2" ]; then - echo "WARNING: could not identify a include directory for $newdir, expect false positives..." + echo "WARNING: could not identify an include directory for $newdir, expect false positives..." >&2 else ABIDIFF_OPTIONS="$ABIDIFF_OPTIONS --headers-dir2 $incdir2" fi @@ -46,23 +46,24 @@ for dump in $(find $refdir -name "*.dump"); do fi dump2=$(find $newdir -name $name) if [ -z "$dump2" ] || [ ! -e "$dump2" ]; then - echo "Error: can't find $name in $newdir" + echo "Error: cannot find $name in $newdir" >&2 error=1 continue fi + echo abidiff $ABIDIFF_OPTIONS $dump $dump2 abidiff $ABIDIFF_OPTIONS $dump $dump2 || { abiret=$? - echo "Error: ABI issue reported for 'abidiff $ABIDIFF_OPTIONS $dump $dump2'" + echo "Error: ABI issue reported for 'abidiff $ABIDIFF_OPTIONS $dump $dump2'" >&2 error=1 echo if [ $(($abiret & 3)) -ne 0 ]; then - echo "ABIDIFF_ERROR|ABIDIFF_USAGE_ERROR, this could be a script or environment issue." + echo "ABIDIFF_ERROR|ABIDIFF_USAGE_ERROR, this could be a script or environment issue." >&2 fi if [ $(($abiret & 4)) -ne 0 ]; then - echo "ABIDIFF_ABI_CHANGE, this change requires a review (abidiff flagged this as a potential issue)." + echo "ABIDIFF_ABI_CHANGE, this change requires a review (abidiff flagged this as a potential issue)." >&2 fi if [ $(($abiret & 8)) -ne 0 ]; then - echo "ABIDIFF_ABI_INCOMPATIBLE_CHANGE, this change breaks the ABI." + echo "ABIDIFF_ABI_INCOMPATIBLE_CHANGE, this change breaks the ABI." >&2 fi echo } diff --git a/devtools/gen-abi.sh b/devtools/gen-abi.sh index c44b0e228a..f15a3b9aaf 100755 --- a/devtools/gen-abi.sh +++ b/devtools/gen-abi.sh @@ -3,13 +3,13 @@ # Copyright (c) 2019 Red Hat, Inc. if [ $# != 1 ]; then - echo "Usage: $0 installdir" + echo "Usage: $0 installdir" >&2 exit 1 fi installdir=$1 if [ ! -d $installdir ]; then - echo "Error: install directory '$installdir' does not exist." + echo "Error: install directory '$installdir' does not exist." >&2 exit 1 fi diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh index ed44d4ffb1..16a81b6241 100755 --- a/devtools/test-meson-builds.sh +++ b/devtools/test-meson-builds.sh @@ -194,10 +194,15 @@ build () # install_target $builds_dir/$targetdir \ $(readlink -f $builds_dir/$targetdir/install) + echo "Checking ABI compatibility of $targetdir" >&$verbose + echo $srcdir/devtools/gen-abi.sh \ + $(readlink -f $builds_dir/$targetdir/install) >&$veryverbose $srcdir/devtools/gen-abi.sh \ - $(readlink -f $builds_dir/$targetdir/install) + $(readlink -f $builds_dir/$targetdir/install) >&$veryverbose + echo $srcdir/devtools/check-abi.sh $abirefdir/$targetdir \ + $(readlink -f $builds_dir/$targetdir/install) >&$veryverbose $srcdir/devtools/check-abi.sh $abirefdir/$targetdir \ - $(readlink -f $builds_dir/$targetdir/install) + $(readlink -f $builds_dir/$targetdir/install) >&$verbose fi } -- 2.29.2