From patchwork Fri Jan 19 02:00:05 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: 125067 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp83473ljf; Thu, 18 Jan 2018 18:01:36 -0800 (PST) X-Google-Smtp-Source: ACJfBosz8phQ+Md/fsvb9W+Os/BO7l0p16iSvFFJjQ3Bw6ygmp6Ht/5H2kLgCPcdwVRsZhoweLhT X-Received: by 10.55.215.20 with SMTP id m20mr66746737qki.60.1516327295847; Thu, 18 Jan 2018 18:01:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516327295; cv=none; d=google.com; s=arc-20160816; b=SgRtgBSxK2cYRxecl+Das4LyUGT8Oz/Aohu71XDitM4u2S6bs8x4PKBlDipXIiuD4F Yuyle76CV5tXmMxpTRNq1jzHcAl73BvlXm9qKqkberKOGJ0VEwUN1oVBOWnNytf/vU8G IakvosoDLEiuh49rgrnmBM0OawVqZMkwQphzcNayYkbH6KapR5QuxP7QIJDaEn6zdbAo jdGYsypV7mVKQtDpXOwVWUrVFCag5+0pjWzRv06gRrIab+UKR1iNDvpnvIsBhd1J43T4 fknlcSVQioZ/TXzIGMy+N5EPOxcj8KAdBFXHoiweWM6WtCuZSGpt/MMA/eK6NUALkKix itiw== 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=bT+pMusa04hXF9g19YUw72xGG9T7jKCKaUav7wbeMZg=; b=of5U3DqLnCWrr8BNjDx65ZoZw8shMgjBjPbkqLnIaptfaEqQtQZrB+mieoQvdOQQlI pj2N/4FVuWNZDrS0d4cydBgUPriaIbwOt1MX0ABNwoca0U0XJ/XfubpuTg46O38w2Poa 7rNYKPM9fMf2CP5eBQLo2lAlpH4N/O5OScir5QDEcZrloPyfsY+VwJ25wQWsQ93JkBO4 3jbPK6RRIWEg9Y6s9Crh/BuUuaqdjj6R/zjRWOZG7lK9pvqXXIMd597b33oMvAW3tyNt nIJCXxi2Jw/fuX7nEY00bamEQVgdCAw8hUbivNxfXxFIW+SEOuF1BydrmWXQcfW2CrB6 Bvbg== 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 q3si8784629qki.5.2018.01.18.18.01.35; Thu, 18 Jan 2018 18:01:35 -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 8186A6278B; Fri, 19 Jan 2018 02:01:35 +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_H2 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 E3A4C6277D; Fri, 19 Jan 2018 02:00:59 +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 65B96617DC; Fri, 19 Jan 2018 02:00:54 +0000 (UTC) Received: from forward100o.mail.yandex.net (forward100o.mail.yandex.net [37.140.190.180]) by lists.linaro.org (Postfix) with ESMTPS id 4793E619C7 for ; Fri, 19 Jan 2018 02:00:25 +0000 (UTC) Received: from mxback3j.mail.yandex.net (mxback3j.mail.yandex.net [IPv6:2a02:6b8:0:1619::10c]) by forward100o.mail.yandex.net (Yandex) with ESMTP id A3B8C2A23A7A for ; Fri, 19 Jan 2018 05:00:23 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback3j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id TZhYj3yjtM-0Nu0ufii; Fri, 19 Jan 2018 05:00:23 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id MJUZq2jn8X-0GJGiNFL; Fri, 19 Jan 2018 05:00:16 +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 05:00:05 +0300 Message-Id: <1516327210-19457-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516327210-19457-1-git-send-email-odpbot@yandex.ru> References: <1516327210-19457-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 402 Subject: [lng-odp] [PATCH v3 1/6] travis: stop early when installation of cross-packages has failed 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 If installation of cross-packages fails, installation will abort with obscure error message. Stop early providing more precise "error" point. 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: bec38d48297ebf78da7d67c986b91604e4597080 **/ .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index b614668c5..39dbb5865 100644 --- a/.travis.yml +++ b/.travis.yml @@ -97,15 +97,15 @@ before_install: sudo -E apt-add-repository -y "deb http://ports.ubuntu.com trusty main" ; sudo -E apt-add-repository -y "deb http://ports.ubuntu.com trusty-updates main" ; sudo -E apt-get -y update || true ; - sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install build-essential ; + sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install build-essential || exit 1; if [ "$CROSS_ARCH" = "i386" ] ; then - sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install g++-multilib ; + sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install g++-multilib || exit 1; else - sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install g++-"$CROSS_GNU_TYPE" ; + sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install g++-"$CROSS_GNU_TYPE" || exit 1; fi ; - sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install libc6-dev:"$CROSS_ARCH" libssl-dev:"$CROSS_ARCH" zlib1g-dev:"$CROSS_ARCH" libconfig-dev:"$CROSS_ARCH" libstdc++-4.8-dev:"$CROSS_ARCH" libpcap0.8-dev:"$CROSS_ARCH" ; - [ "$CROSS_ARCH" = "armhf" ] || sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install libnuma-dev:"$CROSS_ARCH"; + sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install libc6-dev:"$CROSS_ARCH" libssl-dev:"$CROSS_ARCH" zlib1g-dev:"$CROSS_ARCH" libconfig-dev:"$CROSS_ARCH" libstdc++-4.8-dev:"$CROSS_ARCH" libpcap0.8-dev:"$CROSS_ARCH" || exit 1; + [ "$CROSS_ARCH" = "armhf" ] || sudo -E apt-get -y --no-install-suggests --no-install-recommends --force-yes install libnuma-dev:"$CROSS_ARCH" || exit 1; export PKG_CONFIG_PATH=/usr/lib/${CROSS_MULTIARCH}/pkgconfig:/usr/${CROSS_MULTIARCH}/lib/pkgconfig ; fi - if [ "${CC#clang}" != "${CC}" ] ; From patchwork Fri Jan 19 02:00:06 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: 125066 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp83243ljf; Thu, 18 Jan 2018 18:01:03 -0800 (PST) X-Google-Smtp-Source: ACJfBouYQ6Im4cEbAENtNnNcUMo3+XYwTGTr8OalS9QAzDSsu0FzIANbNJ2Zou3VZ+4GC1hTQ5Uz X-Received: by 10.237.54.132 with SMTP id f4mr40146627qtb.139.1516327263008; Thu, 18 Jan 2018 18:01:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516327263; cv=none; d=google.com; s=arc-20160816; b=sxUoIONNqgHaiaorWm3rQfpSwgLtsYwN4H/1sDYd42TzcSLdLotoiw7JwANLRIaTdd 292fxlEQWcZCO0cK3ZmkXi++D/qpALi7W59hwuEciykmAJ9N+ggT+wbvsOOHYFb10gM8 bnzKwqTaNC6fbocRMD7Uu/GCz08PWH5ZxaFSqV+zzm22qZ4r14OZ9pNeG+wgiDUw+KYl PNEZgPFw/GMjjE1f72IliXvkhtXkAdHwcvjCXR/A51/it3+FmPolZRLIO/wYAoLlnI99 SzM+GQ9HUqrLZwaMQXaWpuExgO63Uhgdu+OROtAx/tdhHKKAwmrbvLvLtRxbL7V0GFa2 2Ykw== 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=DzMmCK6o56yCMNS8QpcohzLvF6Oad9gXKjNZIJkJPaA=; b=m59ykhe5BukWHqSUpH81HjCSuug2mRychlmVjJMeAAY94pv4VoS2MYVqDdW9mbKHSj 2Rs4PcxZmeN/WkapQBlCydK2t7u/MFH5BCNeQ1mL2VQDzUQhRpXZY4FVMKoXB9qTfICa Bt5J5ysQMtxp5xFP9bNgVve94TnlzamnJDYgSTJxQ4hEPuBnOF+QcYppA4Tzk/ptIvo3 WqCOcJJdOufGECHbxPTnxrnkBKy9hsXkYUKCLKsOkbAmXgq/cSh0HcVUK2ET5DrQ6XXk CTe3Q9aRAHNNeZPLPyh5dP2fqhSiUPG+TQ6XFxgxhBc8uuSgnAFnAwJgLQsnUXlZaeWl F4cg== 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 m75si8542500qki.391.2018.01.18.18.01.02; Thu, 18 Jan 2018 18:01:02 -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 A6C6E6179E; Fri, 19 Jan 2018 02:01:02 +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 89667617DC; Fri, 19 Jan 2018 02:00:56 +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 5D2086173D; Fri, 19 Jan 2018 02:00:54 +0000 (UTC) Received: from forward101j.mail.yandex.net (forward101j.mail.yandex.net [5.45.198.241]) by lists.linaro.org (Postfix) with ESMTPS id 88CA66173D for ; Fri, 19 Jan 2018 02:00:49 +0000 (UTC) Received: from mxback14g.mail.yandex.net (mxback14g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:93]) by forward101j.mail.yandex.net (Yandex) with ESMTP id 24BBA12453C1 for ; Fri, 19 Jan 2018 05:00:48 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback14g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id cHNhsp1HF5-0m0iPWiL; Fri, 19 Jan 2018 05:00:48 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id MJUZq2jn8X-0NJexKEe; Fri, 19 Jan 2018 05:00:23 +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 05:00:06 +0300 Message-Id: <1516327210-19457-3-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516327210-19457-1-git-send-email-odpbot@yandex.ru> References: <1516327210-19457-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 402 Subject: [lng-odp] [PATCH v3 2/6] travis: compile doxygen only for doxygen test 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 All other tests do not use doxygen. So let's compile doxygen only for doxygen test, saving few minutes. 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: bec38d48297ebf78da7d67c986b91604e4597080 **/ .travis.yml | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 39dbb5865..df942de59 100644 --- a/.travis.yml +++ b/.travis.yml @@ -156,18 +156,6 @@ before_install: - export PKG_CONFIG_PATH="$HOME/cunit-install/$CROSS_ARCH/lib/pkgconfig:${PKG_CONFIG_PATH}" - find $HOME/cunit-install - # Updated Doxygen - - | - if [ ! -f "$HOME/doxygen-install/bin/doxygen" ]; then - wget https://github.com/doxygen/doxygen/archive/Release_1_8_13.tar.gz - tar xpvf Release_1_8_13.tar.gz - pushd doxygen-Release_1_8_13 - cmake -DCMAKE_INSTALL_PREFIX=$HOME/doxygen-install . - make install - popd - fi - - export PATH=$HOME/doxygen-install/bin:$PATH - install: - echo 1000 | sudo tee /proc/sys/vm/nr_hugepages @@ -310,7 +298,17 @@ jobs: env: TEST=doxygen compiler: gcc install: - - true + # Updated Doxygen + - | + if [ ! -f "$HOME/doxygen-install/bin/doxygen" ]; then + wget https://github.com/doxygen/doxygen/archive/Release_1_8_13.tar.gz + tar xpvf Release_1_8_13.tar.gz + pushd doxygen-Release_1_8_13 + cmake -DCMAKE_INSTALL_PREFIX=$HOME/doxygen-install . + make install + popd + fi + - export PATH=$HOME/doxygen-install/bin:$PATH script: - ./bootstrap - ./configure From patchwork Fri Jan 19 02:00:07 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: 125068 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp83715ljf; Thu, 18 Jan 2018 18:02:14 -0800 (PST) X-Google-Smtp-Source: ACJfBov5pcc7P5Wh+Q6ibYZG+QEcOOjGJGHRGrxkf+CpCXGfpR7DpRxvStDl3bQBkxHK83RzrG5j X-Received: by 10.200.56.19 with SMTP id q19mr27818550qtb.313.1516327333975; Thu, 18 Jan 2018 18:02:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516327333; cv=none; d=google.com; s=arc-20160816; b=OilH115q2fj1lTDNOTncoGZVQTarxKDkypmwa/aqDUJTXEtD6qObHgMuTjGwGNoO1I 59rh9XKlwtXsPzhXj8RdNhcP+9vrF4K1TlotaYSidZZp9H81CYQfC7F6c28CGPaJWwuN 7L1nbNVjMuOQ7sgcR+n4nhOlqz6cctgd4/CbainTOxTcbkPZ2GewLtLqdwdrEM/dSj5r gcHUuCIC4yovLMRQVRqONY1cW7OEKCcSUd5qyu7W8QVmYHDqtZRAgmlLqWC/FOOVqF7D WCo3SFyihubdeiViFnK0fbqfyN2MDuQpC+3R+3LbcYHtcOJ8JULx7VUgHK9ZtJL1xzUy m/aQ== 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=ECZZ48+xZ0ZthcQEaWXPqCOMgDYNGD6cly1+aXg3bAY=; b=zEahzfZ1nXgeH7SpswRSGtWtK1XuQkSxwIsx9Nr5mMCXz6auEVdy5VbfINlyTOtOH0 IwK/C7zwxnuT4HqFj0DqVmiy/UTbgmf0Yzokpl/QfPhyr4VVW8wLbiC2boFMkNWXSlWb aPSqvwC9BKHSNeb+oKXUouEeizS93yE9B7K650qL0FlptIHemhQb/t5x+tQcVYffxqvK B/cCG7nV55tdnzGbRNOjCq6JNJqBpMK/lSDGa8skaLhm149WcI0YwTMzn0IYS76ZMk9Q 1W2fJeG88I7rzVyL5989s/mt1F0E212oOSNNSpc3MAVCagqoIV2hFIv4ZgMlerEiReji AOKQ== 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 q27si758730qta.362.2018.01.18.18.02.13; Thu, 18 Jan 2018 18:02:13 -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 A3A6B627D0; Fri, 19 Jan 2018 02:02:13 +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_H2 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 4223A617DC; Fri, 19 Jan 2018 02:01:04 +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 3E60E6173D; Fri, 19 Jan 2018 02:00:59 +0000 (UTC) Received: from forward104p.mail.yandex.net (forward104p.mail.yandex.net [77.88.28.107]) by lists.linaro.org (Postfix) with ESMTPS id F1D626173D for ; Fri, 19 Jan 2018 02:00:55 +0000 (UTC) Received: from mxback4o.mail.yandex.net (mxback4o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1e]) by forward104p.mail.yandex.net (Yandex) with ESMTP id B60FA184057 for ; Fri, 19 Jan 2018 05:00:54 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback4o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id GTyByhox85-0s9WtNhh; Fri, 19 Jan 2018 05:00:54 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id MJUZq2jn8X-0mJe8hWP; Fri, 19 Jan 2018 05:00:48 +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 05:00:07 +0300 Message-Id: <1516327210-19457-4-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516327210-19457-1-git-send-email-odpbot@yandex.ru> References: <1516327210-19457-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 402 Subject: [lng-odp] [PATCH v3 3/6] travis: use parallel make for all builds 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 Use parallel make to build everything, speeding up builds. 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: bec38d48297ebf78da7d67c986b91604e4597080 **/ .travis.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index df942de59..cd571f4f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -149,7 +149,7 @@ before_install: automake --add-missing --include-deps --copy autoconf ./configure --prefix=$HOME/cunit-install/$CROSS_ARCH --enable-debug --enable-automated --enable-basic --enable-console --enable-examples --enable-test $CROSS || cat config.log - make + make -j $(nproc) sudo make install popd fi @@ -214,7 +214,7 @@ install: sed -ri -e 's,(CONFIG_RTE_KNI_KMOD=).*,\1n,' .config fi popd - make install T=${TARGET} EXTRA_CFLAGS="-fPIC $DPDK_CFLAGS" CROSS="$DPDK_CROSS" + make install T=${TARGET} EXTRA_CFLAGS="-fPIC $DPDK_CFLAGS" CROSS="$DPDK_CROSS" -j $(nproc) rm -r ./doc ./${TARGET}/app ./${TARGET}/build popd EXTRA_CONF="$EXTRA_CONF --with-dpdk-path=`pwd`/dpdk/${TARGET}" @@ -227,7 +227,7 @@ install: git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v11.2 https://github.com/luigirizzo/netmap.git pushd netmap/LINUX ./configure - make + make -j $(nproc) popd fi sudo insmod ./netmap/LINUX/netmap.ko @@ -276,6 +276,7 @@ jobs: CXXFLAGS="-O0 -coverage" LDFLAGS="--coverage" --enable-debug=full --enable-helper-linux + - CCACHE_DISABLE=1 make -j $(nproc) - sudo CCACHE_DISABLE=1 LD_LIBRARY_PATH="$HOME/cunit-install/$CROSS_ARCH/lib:$LD_LIBRARY_PATH" PATH=${PATH//:\.\/node_modules\/\.bin/} make check - find . -type f -iname '*.[ch]' -not -path ".git/*" -execdir gcov {} \; ; bash <(curl -s https://codecov.io/bash) -X coveragepy - stage: test @@ -305,6 +306,7 @@ jobs: tar xpvf Release_1_8_13.tar.gz pushd doxygen-Release_1_8_13 cmake -DCMAKE_INSTALL_PREFIX=$HOME/doxygen-install . + make -j $(nproc) make install popd fi @@ -337,7 +339,7 @@ jobs: script: - ./bootstrap - ./configure --enable-helper-linux - - make + - make -j $(nproc) - stage: "build only" env: CONF="" compiler: clang-3.8 @@ -345,7 +347,7 @@ jobs: script: - ./bootstrap - ./configure --enable-helper-linux - - make + - make -j $(nproc) - stage: "build only" env: CROSS_ARCH="i386" compiler: gcc @@ -353,7 +355,7 @@ jobs: script: - ./bootstrap - ./configure --enable-helper-linux $CROSS - - make + - make -j $(nproc) - stage: "build only" env: CROSS_ARCH="arm64" compiler: gcc @@ -361,7 +363,7 @@ jobs: script: - ./bootstrap - ./configure --enable-helper-linux $CROSS - - make + - make -j $(nproc) after_failure: - cat config.log From patchwork Fri Jan 19 02:00:08 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: 125069 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp83970ljf; Thu, 18 Jan 2018 18:02:57 -0800 (PST) X-Google-Smtp-Source: ACJfBose4ACBo237kXQPoO4nrlnEswpOUUHz31ZUQEXn/To2b7MkINL6NA8tyf5GpJ0Ht88myWJC X-Received: by 10.55.1.207 with SMTP id u76mr51858380qkg.344.1516327377172; Thu, 18 Jan 2018 18:02:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516327377; cv=none; d=google.com; s=arc-20160816; b=ff6qYOZlVFQxdPwXW9PRz7UhmYiZUHj3rQPwJ6+H7pPnfVKpndJw1x7SElug/iFP75 T45H+caX5+27mI8vj0Fl//7cuWP1gl2djzxAT4MjgjbcEsHET5k332Oj4TEQquz0Ztqh bHuwxnrFFb1yQBNlc0o/b1rABagZUFTHoayICsgXTLqKFOBGIZsWZPG2xS+mctRvttCN HPEQClipxcqo29EGi8i1lhoKlhamj4knjhXCTMIZ6f6g2dIFsfksz8be2KzY+2ThDL7I BwXVQiEr1onUB2DBIXJ9xsYwOhf4zaR44fgOlwYn6ZbOopqWo0AeLKX/dG16kNcy211U CVIQ== 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=XyMswqb2Swf3YZtwTHykUAhbMw42Shuc34A1SGIh0+w=; b=0Fg3DqR9EaxqBPkjVZxeDCbVIr7QHwqnEAj9Xn/aIJj7vSM/yV55BS6w2J1fPJ9Ahr ru0H0kz15Z+rJjFcMT2F7kjRNmCRs/tJ5I4efQceCPjj9vL9eBJFuYxCZIgBNQ0WA7ID +AsMXHoz9Cm/Wfxufc/HBQDW7k9ziDcsxEEmyV9RRV0OHVCsoBiaHxOf+j2rT0OErmbG RYxFZ4wQo/ksTx+/Ymvvy/dhX7PVf7/XjffXk7WQTvMEII53w7tXoaMjWCgAQAFrwNSD bUh1HE1ZJsqDxbDJWkOUHZfi9L5a0ojLdlHDFZpFrfaeCf1C+8Bcq/u9hOj7oFjz+c4G 6hGg== 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 t76si8682696qkt.274.2018.01.18.18.02.56; Thu, 18 Jan 2018 18:02:57 -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 D4806627AF; Fri, 19 Jan 2018 02:02:56 +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_H2 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 D237D627BC; Fri, 19 Jan 2018 02:02:08 +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 21F9C627CC; Fri, 19 Jan 2018 02:02:05 +0000 (UTC) Received: from forward105o.mail.yandex.net (forward105o.mail.yandex.net [37.140.190.183]) by lists.linaro.org (Postfix) with ESMTPS id B170C6173D for ; Fri, 19 Jan 2018 02:01:02 +0000 (UTC) Received: from mxback8g.mail.yandex.net (mxback8g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:169]) by forward105o.mail.yandex.net (Yandex) with ESMTP id 4276C4444641 for ; Fri, 19 Jan 2018 05:01:01 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback8g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id L8CEMKhgOJ-11t0NqNi; Fri, 19 Jan 2018 05:01:01 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id MJUZq2jn8X-0sJeADQR; Fri, 19 Jan 2018 05:00:54 +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 05:00:08 +0300 Message-Id: <1516327210-19457-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516327210-19457-1-git-send-email-odpbot@yandex.ru> References: <1516327210-19457-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 402 Subject: [lng-odp] [PATCH v3 4/6] travis: move --with-dpdk-path out of DPDK build if 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 1b285bbd (travis: also use DPDK when doing cross-compile tests) moved adding --with-dpdk-path to EXTRA_CONF to be executed under DPDK-building if. Move it outside of that if, so that DPDK is enabled even if it's prebuilt. Signed-off-by: Dmitry Eremin-Solenikov Fixes: 1b285bbdd1abbec9853e1bc51bdb6ee02643b1a7 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: bec38d48297ebf78da7d67c986b91604e4597080 **/ .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index cd571f4f3..3f6f70795 100644 --- a/.travis.yml +++ b/.travis.yml @@ -193,7 +193,8 @@ install: ;; esac - | - if [ -n "$TARGET" -a ! -f "dpdk/${TARGET}/lib/libdpdk.a" ]; then + if [ -n "$TARGET" ] ; then + if [ ! -f "dpdk/${TARGET}/lib/libdpdk.a" ] ; 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 @@ -217,7 +218,8 @@ install: make install T=${TARGET} EXTRA_CFLAGS="-fPIC $DPDK_CFLAGS" CROSS="$DPDK_CROSS" -j $(nproc) rm -r ./doc ./${TARGET}/app ./${TARGET}/build popd - EXTRA_CONF="$EXTRA_CONF --with-dpdk-path=`pwd`/dpdk/${TARGET}" + fi + EXTRA_CONF="$EXTRA_CONF --with-dpdk-path=`pwd`/dpdk/${TARGET}" fi # Netmap pktio From patchwork Fri Jan 19 02:00:09 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: 125070 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp84181ljf; Thu, 18 Jan 2018 18:03:31 -0800 (PST) X-Google-Smtp-Source: ACJfBotVhxVfVfqXvLsDDay98mG5SyOHnkxS5aCX7fjv50ejB4XCXyIEYG3iMjID4H6i17g+Kw8z X-Received: by 10.200.25.92 with SMTP id g28mr34615897qtk.193.1516327410960; Thu, 18 Jan 2018 18:03:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516327410; cv=none; d=google.com; s=arc-20160816; b=GHCsQWsuJUAaWdnC5e3eYURb8sGH7qE+Q8r5D9Kj48rHLTEBWxbPD1uObZBH49jI68 ZX0FDsNlD4lpFwt0NY6lghz8XMKKUobnSW7fgcbfWplg3VjNfRmqhUug662YS+cvLhQN m02sGCfDDb0YEQGSuw2kZeSUZ45A3P9hNV2vt41uYGAAEML5zDrpVbLYbYd77JTxFO8X Pn5y8vExPASBKZdJlAmgiekxKt/uCzTip961xb5MnRuuq527Dhg1njqY4rAVGAzqTq2+ 6CLhCKVgd9MYiqFILy7RDOSnAsvsPmmbvnhtLONvMaTMDdmIn4mwrT6HDRjdP64aJmFc HYdw== 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=9GuqHyBH9AtRWo+jKLcvBkVOg0S/1/iwKE68ojCpQk8=; b=1DkHOura/++tb0sI89aISocsorHDJz6qExml9zl1G7fUjolnxkF38jT3xtT0F0Wk8O 5K4gTAcoYFbDeqEW/KPeQ3vZYxakZWJdtUrA8p/6n5BI1h1e+oDq687A+9qaiBWl7Hn8 e18XDcws5hQVgh0rRe3O7yB2MAxitMJiG+YR5vMXMGMzyeWOvk1u6OIgSXfNjXBZd4S0 pscjKWV6/hYVF8lhUUIUgToEEHRMStgLTAJYe+pOXBxyNhdP/DeonZYVHbCsFMpUpSZp sQx0AWqVZ5QqVdXGWnEZmWk0Fj0VvYg44kQgRR8AwrX4tqC57pZ085Ty7ViVg0aKCd/2 9f2Q== 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 h1si8904393qtb.168.2018.01.18.18.03.30; Thu, 18 Jan 2018 18:03:30 -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 A509E6278B; Fri, 19 Jan 2018 02:03:30 +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 9CD88627B0; Fri, 19 Jan 2018 02:02:21 +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 7958E627BD; Fri, 19 Jan 2018 02:02:16 +0000 (UTC) Received: from forward101j.mail.yandex.net (forward101j.mail.yandex.net [5.45.198.241]) by lists.linaro.org (Postfix) with ESMTPS id D406B627B0 for ; Fri, 19 Jan 2018 02:01:08 +0000 (UTC) Received: from mxback9g.mail.yandex.net (mxback9g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:170]) by forward101j.mail.yandex.net (Yandex) with ESMTP id D6E681242DED for ; Fri, 19 Jan 2018 05:01:07 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback9g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id bd3FTOGLZm-17meLV5P; Fri, 19 Jan 2018 05:01:07 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id MJUZq2jn8X-11JS6Xui; Fri, 19 Jan 2018 05:01:01 +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 05:00:09 +0300 Message-Id: <1516327210-19457-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516327210-19457-1-git-send-email-odpbot@yandex.ru> References: <1516327210-19457-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 402 Subject: [lng-odp] [PATCH v3 5/6] build: another fix for linking with shared libdpdk 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 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: bec38d48297ebf78da7d67c986b91604e4597080 **/ m4/odp_dpdk.m4 | 20 ++++++++++++++------ platform/linux-generic/Makefile.am | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/m4/odp_dpdk.m4 b/m4/odp_dpdk.m4 index 1887b0431..315a2fc4d 100644 --- a/m4/odp_dpdk.m4 +++ b/m4/odp_dpdk.m4 @@ -17,18 +17,28 @@ AS_VAR_APPEND([DPDK_PMDS], [--no-whole-archive]) # _ODP_DPDK_SET_LIBS # -------------------- -# Set DPDK_LIBS/DPDK_LIBS_LT depending on DPDK setup +# Set DPDK_LIBS/DPDK_LIBS_LT/DPDK_LIBS_LIBODP depending on DPDK setup AC_DEFUN([_ODP_DPDK_SET_LIBS], [dnl AS_IF([test "x$DPDK_SHARED" = "xyes"], [dnl - DPDK_LIBS_LT="" + # applications don't need to be linked to anything, just rpath + DPDK_LIBS_LT="$DPDK_RPATH_LT" + # static linking flags will need -ldpdk DPDK_LIBS="$DPDK_LDFLAGS $DPDK_RPATH $DPDK_LIBS" + # link libodp-linux with -ldpdk + DPDK_LIBS_LIBODP="$DPDK_LDFLAGS $DPDK_LIBS" ], [dnl ODP_DPDK_PMDS([$DPDK_PMD_PATH]) + # build long list of libraries for applications, which should not be + # rearranged by libtool DPDK_LIBS_LT="`echo $DPDK_LIBS | sed -e 's/^/-Wc,/' -e 's/ /,/g'`" DPDK_LIBS_LT="$DPDK_LDFLAGS $DPDK_PMDS $DPDK_LIBS_LT $DPDK_LIBS" + # static linking flags follow the suite DPDK_LIBS="$DPDK_LDFLAGS $DPDK_PMDS $DPDK_LIBS" + # link libodp-linux with libtool linking flags + DPDK_LIBS_LIBODP="$DPDK_LIBS_LT" ]) AC_SUBST([DPDK_LIBS]) +AC_SUBST([DPDK_LIBS_LIBODP]) AC_SUBST([DPDK_LIBS_LT]) ]) @@ -99,7 +109,6 @@ AC_DEFUN([ODP_DPDK], [dnl AS_IF([test "x$1" = "xsystem"], [dnl DPDK_CPPFLAGS="-isystem/usr/include/dpdk" DPDK_LDFLAGS="" - DPDK_RPATH="" DPDK_LIB_PATH="`$CC --print-file-name=libdpdk.so`" if test "x$DPDK_LIB_PATH" = "x" ; then DPDK_LIB_PATH="`$CC --print-file-name=libdpdk.a`" @@ -115,10 +124,9 @@ AS_IF([test "x$1" = "xsystem"], [dnl DPDK_LDFLAGS="-L$DPDK_LIB_PATH" DPDK_PMD_PATH="$DPDK_LIB_PATH" if test -r "$DPDK_LIB_PATH"/libdpdk.so ; then - DPDK_RPATH="-R$DPDK_LIB_PATH" + DPDK_RPATH="-Wl,-rpath,$DPDK_LIB_PATH" + DPDK_RPATH_LT="-R$DPDK_LIB_PATH" DPDK_SHARED=yes - else - DPDK_RPATH= fi ]) _ODP_DPDK_CHECK([$DPDK_CPPFLAGS], [$DPDK_LDFLAGS], [$2], [$3]) diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 9b7ee37e5..3abf765b5 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -271,7 +271,7 @@ endif __LIB__libodp_linux_la_LIBADD = $(ATOMIC_LIBS) __LIB__libodp_linux_la_LIBADD += $(OPENSSL_LIBS) -__LIB__libodp_linux_la_LIBADD += $(DPDK_LIBS_LT) +__LIB__libodp_linux_la_LIBADD += $(DPDK_LIBS_LIBODP) __LIB__libodp_linux_la_LIBADD += $(PTHREAD_LIBS) __LIB__libodp_linux_la_LIBADD += $(TIMER_LIBS) From patchwork Fri Jan 19 02:00:10 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: 125071 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp84680ljf; Thu, 18 Jan 2018 18:04:53 -0800 (PST) X-Google-Smtp-Source: ACJfBosb8tx8D83UPk7AeBO6i5dpgNmY8mnVWexzbBNmo+6HDuc/uyXrthLS4Ynt1TYaMDZK01pI X-Received: by 10.237.42.20 with SMTP id c20mr29945258qtd.240.1516327493228; Thu, 18 Jan 2018 18:04:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516327493; cv=none; d=google.com; s=arc-20160816; b=SNiTETpP1sSG++zcGQXHhL7BDDdt5YKGGhOgFaCu6nJRF1oaNM5LS/P3B26XnTPySb 3jUNVqIf+lkZGwn4XGqwiyJmfoOwzkl6EineZl2KaYkYO2cxUYDjTq5vvxjmptCS5zAX BL6dMPZ+BXE4qogIJTHiwHIVCnl7+XTW3exV5I6BE8yOP+cIDPahAT5KRg5Y5nrFOXRZ eoXdDj7AMbf44jZlhfSGZUzoniqRFQKWLWMhGeCZCDAREFeyLo9NV9YAreX1GHRNyfZl NlDhg4+Z2HIQYcdJ9VKtLriZsvjFvfI6slcBcXCFexU13PVjRl9jm8zGTV5xjMiSgspg vISg== 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=AKZRkpSDm8UqcQjYXH8Rv/xmQOKreXE74O6pbK/yc+M=; b=XMtAabbpJgnR20kyzZj2/XuR3Ny6d06MoX77ayO58ginJGOmHP9OuvC/q6Qaa3BA97 9Fwmci/wBdeJznW+8hEH65W29Vcn7M6J8iVVWSlMzLSlNC4Cy7PmaNfMTEfBfBS3b1vq GFBwmSQPl0r+8HOlXoxA2pYZ8ZsgO7LciWnCNcDBBpO40BwwXLNJd5JO90O9GlZTBxIB CuqNqxv1/jmIn1R8QYiOZdsh8nId8QpdrJ4B8SDAQjBuPxSzmItIKKswkM3fiLw8NLpx K0H64uqWdpnJWaKkQZRCiYzjNE6SxqaXBx3usLn+ZgnR+gZ6Uqb4LN6KaA8M+ZH1Kzc2 BWxA== 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 x22si613445qka.31.2018.01.18.18.04.53; Thu, 18 Jan 2018 18:04:53 -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 E4E13617CA; Fri, 19 Jan 2018 02:04:52 +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_H2 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 54076627D9; Fri, 19 Jan 2018 02:02:29 +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 C8858627D0; Fri, 19 Jan 2018 02:02:21 +0000 (UTC) Received: from forward104p.mail.yandex.net (forward104p.mail.yandex.net [77.88.28.107]) by lists.linaro.org (Postfix) with ESMTPS id 4F89F627B1 for ; Fri, 19 Jan 2018 02:01:15 +0000 (UTC) Received: from mxback12g.mail.yandex.net (mxback12g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:91]) by forward104p.mail.yandex.net (Yandex) with ESMTP id 3FE5F185070 for ; Fri, 19 Jan 2018 05:01:14 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback12g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id uqbx8TZ1MT-1EXWlU9Q; Fri, 19 Jan 2018 05:01:14 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id MJUZq2jn8X-17JqPgjV; Fri, 19 Jan 2018 05:01:07 +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 05:00:10 +0300 Message-Id: <1516327210-19457-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516327210-19457-1-git-send-email-odpbot@yandex.ru> References: <1516327210-19457-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 402 Subject: [lng-odp] [PATCH v3 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: bec38d48297ebf78da7d67c986b91604e4597080 **/ .travis.yml | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3f6f70795..acaba7a04 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" @@ -194,7 +195,14 @@ install: esac - | if [ -n "$TARGET" ] ; then - if [ ! -f "dpdk/${TARGET}/lib/libdpdk.a" ] ; then + # force DPDK rebuild if it does not match shared/non-shared requirement + if [ -n "$DPDK_SHARED" -a ! -f "dpdk/${TARGET}/lib/libdpdk.so" ] ; then + rm -rf dpdk/"$TARGET" + fi + if [ -z "$DPDK_SHARED" -a ! -f "dpdk/${TARGET}/lib/libdpdk.a" ] ; then + rm -rf dpdk/"$TARGET" + fi + if [ ! -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 @@ -210,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 @@ -254,11 +267,17 @@ script: - pushd $HOME - echo "Dynamic link.." - ${CC} ${CFLAGS} ${OLDPWD}/example/hello/odp_hello.c -o odp_hello_inst_dynamic `PKG_CONFIG_PATH=${HOME}/odp-install/lib/pkgconfig:${PKG_CONFIG_PATH} pkg-config --cflags --libs libodp-linux` - - echo "Static link.." - - ${CC} ${CFLAGS} ${OLDPWD}/example/hello/odp_hello.c -o odp_hello_inst_static `PKG_CONFIG_PATH=${HOME}/odp-install/lib/pkgconfig:${PKG_CONFIG_PATH} pkg-config --cflags --libs libodp-linux --static` -static - if [ -z "$CROSS_ARCH" ] ; then - LD_LIBRARY_PATH="${HOME}/odp-install/lib:$LD_LIBRARY_PATH" ./odp_hello_inst_dynamic ; - ./odp_hello_inst_static ; + LD_LIBRARY_PATH="${HOME}/odp-install/lib:$LD_LIBRARY_PATH" ./odp_hello_inst_dynamic ; + fi + - echo "Static link.." + - | + # it is not possible to do static linking if we only have shared DPDK library. Compiler complains about missing -ldpdk + if [ -z "$TARGET" -o -z "$DPDK_SHARED" ] ; then + ${CC} ${CFLAGS} ${OLDPWD}/example/hello/odp_hello.c -o odp_hello_inst_static `PKG_CONFIG_PATH=${HOME}/odp-install/lib/pkgconfig:${PKG_CONFIG_PATH} pkg-config --cflags --libs libodp-linux --static` -static || exit 1 + if [ -z "$CROSS_ARCH" ] ; then + ./odp_hello_inst_static || exit 1; + fi fi - popd - ccache -s