From patchwork Thu Jan 30 16:00:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 65369 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C2311A0524; Thu, 30 Jan 2020 17:01:04 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id ADBCE1C029; Thu, 30 Jan 2020 17:01:04 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id D922D1C022 for ; Thu, 30 Jan 2020 17:01:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1580400062; 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=np7YNU+ENDAKqazblDLTRtV88zJHSCule8mpuFq5310=; b=K+P4M43QLGFUE7oH7YUSk/Zofv732dLvHM86sSAyXOJXaAUB7rqs1Pw8tCvAZonysS7lGH XcOTX3rzZVOwiQpNe/LowxSf/31wmDEBdpQrMBU1kS3PuYQGiPNPOkYd7r6qTO32IDY8r9 Ic9MVEaaYk+kj5l/Gd+oYIh1OkLKwxo= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-45-KjnsTwHQPCiaCGceA9ipNA-1; Thu, 30 Jan 2020 11:00:42 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5322C10CE781; Thu, 30 Jan 2020 16:00:39 +0000 (UTC) Received: from dmarchan.remote.csb (ovpn-204-128.brq.redhat.com [10.40.204.128]) by smtp.corp.redhat.com (Postfix) with ESMTP id D0AA01001B28; Thu, 30 Jan 2020 16:00:32 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: thomas@monjalon.net, bruce.richardson@intel.com, kevin.laatz@intel.com, aconole@redhat.com, nhorman@tuxdriver.com, akhil.goyal@nxp.com, anoobj@marvell.com, bluca@debian.org, fiona.trahe@intel.com, ferruh.yigit@intel.com, Michael Santana Date: Thu, 30 Jan 2020 17:00:08 +0100 Message-Id: <20200130160009.6549-4-david.marchand@redhat.com> In-Reply-To: <20200130160009.6549-1-david.marchand@redhat.com> References: <20191220152058.10739-1-david.marchand@redhat.com> <20200130160009.6549-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: KjnsTwHQPCiaCGceA9ipNA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [dpdk-dev] [PATCH v3 3/4] build: test meson installation 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" Let's test installing with meson as part of Travis and the devtools/test-meson-builds.sh script. The resulting headers and binaries make more sense to run checks against, since they should be the same as what the final users get. test-null.sh is now called on an installed testpmd. The (future) ABI compatibility checks will also need to filter its report against installed public headers. Signed-off-by: David Marchand Acked-by: Luca Boccassi --- Changelog since v2: - removed forced --prefix= parameter in test-meson-builds.sh to avoid breakage of existing environments, - simplified install with no special verbose mode, - removed ldd call in test-null.sh since the main user of this script finds this change too much for his eyes, --- .ci/linux-build.sh | 6 +++++- devtools/test-meson-builds.sh | 21 +++++++++++---------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh index ccc3a7ccd..e61aa2b0a 100755 --- a/.ci/linux-build.sh +++ b/.ci/linux-build.sh @@ -29,11 +29,15 @@ if [ "$BUILD_32BIT" = "1" ]; then fi OPTS="$OPTS --default-library=$DEF_LIB" +OPTS="$OPTS --prefix=/usr -Dlibdir=lib" meson build --werror -Dexamples=all $OPTS ninja -C build +DESTDIR=$(pwd)/install ninja -C build install if [ "$AARCH64" != "1" ]; then - devtools/test-null.sh + export LD_LIBRARY_PATH=$(pwd)/install/usr/lib + devtools/test-null.sh install/usr/bin/dpdk-testpmd + unset LD_LIBRARY_PATH fi if [ "$RUN_TESTS" = "1" ]; then diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh index fb6c404e5..747fb4a1a 100755 --- a/devtools/test-meson-builds.sh +++ b/devtools/test-meson-builds.sh @@ -66,7 +66,7 @@ config () # if [ -f "$builddir/build.ninja" ] ; then return fi - options="--werror -Dexamples=all" + options="--werror -Dexamples=all -Dlibdir=lib" for option in $DPDK_MESON_OPTIONS ; do options="$options -D$option" done @@ -75,7 +75,7 @@ config () # $MESON $options $dir $builddir } -compile () # +compile () # { builddir=$1 if [ -n "$TEST_MESON_BUILD_VERY_VERBOSE" ] ; then @@ -90,6 +90,9 @@ compile () # echo "$ninja_cmd -C $builddir" $ninja_cmd -C $builddir fi + rm -rf $2 + echo "DESTDIR=$2 $ninja_cmd -C $builddir install" + DESTDIR=$2 $ninja_cmd -C $builddir install } build () # @@ -102,7 +105,8 @@ build () # command -v ${CC##* } >/dev/null 2>&1 || return 0 load_env $targetcc || return 0 config $srcdir $builds_dir/$targetdir $* - compile $builds_dir/$targetdir + compile $builds_dir/$targetdir \ + $(readlink -f $builds_dir/$targetdir/install) } if [ "$1" = "-vv" ] ; then @@ -134,7 +138,7 @@ ok=$(cc -march=$default_machine -E - < /dev/null > /dev/null 2>&1 || echo false) if [ "$ok" = "false" ] ; then default_machine='corei7' fi -build build-x86-default cc -Dlibdir=lib -Dmachine=$default_machine $use_shared +build build-x86-default cc -Dmachine=$default_machine $use_shared c=aarch64-linux-gnu-gcc # generic armv8a with clang as host compiler @@ -150,12 +154,9 @@ for f in $srcdir/config/arm/arm64_[bdo]*gcc ; do unset CC done -# Test installation of the x86-default target, to be used for checking -# the sample apps build using the pkg-config file for cflags and libs -build_path=$(readlink -f $builds_dir/build-x86-default) -export DESTDIR=$build_path/install-root -$ninja_cmd -C $build_path install - +# Use the x86-default target, to check the sample apps build using the +# pkg-config file for cflags and libs +export DESTDIR=$(readlink -f $builds_dir/build-x86-default/install) load_env cc pc_file=$(find $DESTDIR -name libdpdk.pc) export PKG_CONFIG_PATH=$(dirname $pc_file):$PKG_CONFIG_PATH