From patchwork Thu Jan 18 23:00:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 125059 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp34343ljf; Thu, 18 Jan 2018 15:04:34 -0800 (PST) X-Google-Smtp-Source: ACJfBot6AfHq2BVGFO1Kqi+xpJmzYJ+y0yiFBBqZ+CmM6muF9Lq7ZfwEwhPYOCOVXtArqx8IKTEP X-Received: by 10.55.8.150 with SMTP id 144mr52641559qki.8.1516316674620; Thu, 18 Jan 2018 15:04:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516316674; cv=none; d=google.com; s=arc-20160816; b=u6FYe+AI4s8eMg2bTjrU/NRyNeuN5ZqGdv59tc2fEN/VKYjA9EqcESAdZ24zTca1DY 0Q+IY4Uea//V+jI9sKIXOrR1wyj6bQxoXXttNdPJwS4hB3lOfcrHDY4dpiQ9be6Vh3Dh vohq1j0dZUruc5XjGm/ah+uJV1X3ilDqoBV2Tlgu5vxB3xZfuCVrOfrryKjRkPtdkOLZ vV/58iQPj3e8ICvDgH4btDaf/ey2kH/qbbg9nWHKCPWH2wFvGvC3Y7rd73esu8cDudog IBm+wLL7lwynk161xNatGEdTPLl5Cqr45XpkRjHEHZUQJClMFyPzqWWL+fDjF38UqnZQ Rn1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=q/uIqQ2N27Oyqvuuwn53tAKnnJEEyP5wGHT+Ot01iQg=; b=dAZB9epcZjehdRyhHiD6N66lrTN+JbrxuyKigsB4Y2ECu6JhangCP3yrdDW/JStpzQ SIx9deyDWwTXzTge2ANfJYDyn/N9A1Zoex97UsvGtZ88AUQIiDybKus0FOaFfLZd/Uw9 TpaNBs02mwdq5nFP2gMpmVy48xYdUdj1euLWFngZ/NB+zdIKR5KsP1eSDOj51vB7jRY0 0KOxcXMLO41FPPhTXQR2VkSBUZmhEMWrMJDEqVQTShK6oiCoXXMEtevsz8/btomUApGp 68zjmO1nk04imsELT6Igf3zrOMduIA4Pumeln/SIRx2TVRHM7Sj6mHQ0kSIBrpVpD1T5 Xu5g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id h102si977145qkh.414.2018.01.18.15.04.34; Thu, 18 Jan 2018 15:04:34 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 56EA6617D2; Thu, 18 Jan 2018 23:04:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id D5E6162799; Thu, 18 Jan 2018 23:02:43 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id A5DD5617AA; Thu, 18 Jan 2018 23:02:30 +0000 (UTC) Received: from forward106o.mail.yandex.net (forward106o.mail.yandex.net [37.140.190.187]) by lists.linaro.org (Postfix) with ESMTPS id 72BDF61795 for ; Thu, 18 Jan 2018 23:02:16 +0000 (UTC) Received: from mxback5g.mail.yandex.net (mxback5g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:166]) by forward106o.mail.yandex.net (Yandex) with ESMTP id 08ADC7844F4 for ; Fri, 19 Jan 2018 02:02:15 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback5g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id roaoAv7Q2O-2EMKS4vL; Fri, 19 Jan 2018 02:02:14 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id dngx7RWyZH-28qqoCGO; Fri, 19 Jan 2018 02:02:08 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Fri, 19 Jan 2018 02:00:20 +0300 Message-Id: <1516316420-16628-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516316420-16628-1-git-send-email-odpbot@yandex.ru> References: <1516316420-16628-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 402 Subject: [lng-odp] [PATCH v2 6/6] travis: test ODP with shared DPDK X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Add testcase compiling and running ODP with shared DPDK lib Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 402 (lumag:travis-upd) ** https://github.com/Linaro/odp/pull/402 ** Patch: https://github.com/Linaro/odp/pull/402.patch ** Base sha: 5a4502fc6bc53e6503169da3028f456b64811a0b ** Merge commit sha: 3d02540f1ad3c03edc8b784bf0f92b86d9b756a1 **/ .travis.yml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2b56de029..3feb3734a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,6 +74,7 @@ env: - CONF="--enable-schedule-iquery" - CONF="--enable-schedule-scalable" - CONF="--enable-dpdk-zero-copy" + - DPDK_SHARED="y" - CROSS_ARCH="arm64" - CROSS_ARCH="armhf" CFLAGS="-march=armv7-a" - CROSS_ARCH="powerpc" @@ -193,7 +194,15 @@ install: ;; esac - | - if [ -n "$TARGET" -a ! -f "dpdk/${TARGET}/lib/libdpdk.a" ]; then + # force DPDK rebuild if it does not match shared/non-shared requirement + if [ -n "$TARGET" -a -n "$DPDK_SHARED" -a ! -f "dpdk/${TARGET}/lib/libdpdk.so" ] ; then + rm -rf dpdk/"$TARGET" + fi + if [ -n "$TARGET" -a -z "$DPDK_SHARED" -a ! -f "dpdk/${TARGET}/lib/libdpdk.a" ] ; then + rm -rf dpdk/"$TARGET" + fi + - | + if [ -n "$TARGET" -a ! -f "dpdk/${TARGET}/lib/libdpdk.a" -a ! -f "dpdk/${TARGET}/lib/libdpdk.so" ]; then git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v${DPDK_VERS} http://dpdk.org/git/dpdk dpdk pushd dpdk git log --oneline --decorate @@ -209,6 +218,11 @@ install: if test -n "${DPDK_MACHINE}" ; then sed -ri 's,(CONFIG_RTE_MACHINE=).*,\1"'${DPDK_MACHINE}'",' .config fi + if test -n "${DPDK_SHARED}" ; then + sed -ri 's,(CONFIG_RTE_BUILD_SHARED_LIB=).*,\1y,' .config + export LD_LIBRARY_PATH="`pwd`/${TARGET}:$LD_LIBRARY_PATH" + echo $LD_LIBRARY_PATH + fi if test -n "$CROSS_ARCH" ; then sed -ri -e 's,(CONFIG_RTE_EAL_IGB_UIO=).*,\1n,' .config sed -ri -e 's,(CONFIG_RTE_KNI_KMOD=).*,\1n,' .config