From patchwork Mon Oct 9 14:00:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 115248 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp2602770qgn; Mon, 9 Oct 2017 07:10:45 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBq4AZktjQIdPoeyxb7XDDsrTNtSG5po5BlycVjxLZfpZAOckEw9RCxcsoAXvPc3kuCJ/w3 X-Received: by 10.200.28.42 with SMTP id a39mr5874085qtk.126.1507558245065; Mon, 09 Oct 2017 07:10:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507558245; cv=none; d=google.com; s=arc-20160816; b=iWvaiGiGpN+bdDNSiHR0jU7lGqpbUXN9aTYXcDXtUUrz+KSSPHKiPGEQZ2+/QfUewY qrMNen1nVlN5LgxXY+RsSUIhkMPwECWyGUhEt0j3/DPf47c/s6ZS5XDG9dFZbZ1oWrqe 76FwLPCOLGsJefD0BrkclVxg5s8Y7BNII1m51p1Sk3BFyH+bjBBKjg8HCpEE1nPJ6tkS GQv19nfaYXRvjtDKwAsoFZ3VsWTp+jF3kI5+Sy21HhgQT6UqYBCz0lDV3j5w2C0mr3yd EuPZdES7Gu3crZ9eajjlXfDyrLA4yLX18jMjlm4XtbGbRhImgxfbGCseHL/doguyOF7A NqIQ== 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=TCDEWf1ShOYsdTph2z1u49M3pR4JHt1yFC2oKEGYvTw=; b=lGbjsNS4787POzKos/ZBxutcgtGS/ihEFLUUIHDYsDsUduH6wz6brbvJcI3BZAwPII yAT8XXz0fES3K3HOUUGvd+JN2iYaWBbTWHWNvg/wB3zNA+M0hMWc2WAikWNbu1tEpbk5 EpUYj6YKCen9hqyKHzixqJCoR/NBtLOMsUxUX+U1OYeMvDChofdmb8BxA08F1Zwso/0V Rcj/AapUoVvlSCVXU0zrznCfqgobLxurYQWq1mW9y+YIeAy6N9TEig8G9sNNrE0nvkhU bbL7jOqjF571FUx0Hzlp7KFPZjnpBvI6uUuUkKsJeohXQc9MYHHokZ63WSpARjT51P1m wcIA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 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 (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id u36si2634548qtb.345.2017.10.09.07.10.44; Mon, 09 Oct 2017 07:10:45 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 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 B891560C2F; Mon, 9 Oct 2017 14:10:44 +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=-5.4 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, URIBL_BLOCKED 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 706B3609C3; Mon, 9 Oct 2017 14:02:51 +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 0041860C3E; Mon, 9 Oct 2017 14:02:36 +0000 (UTC) Received: from forward101p.mail.yandex.net (forward101p.mail.yandex.net [77.88.28.101]) by lists.linaro.org (Postfix) with ESMTPS id D075E60BDB for ; Mon, 9 Oct 2017 14:00:54 +0000 (UTC) Received: from mxback16j.mail.yandex.net (mxback16j.mail.yandex.net [IPv6:2a02:6b8:0:1619::92]) by forward101p.mail.yandex.net (Yandex) with ESMTP id AE7FE6A835D1 for ; Mon, 9 Oct 2017 17:00:53 +0300 (MSK) Received: from smtp4o.mail.yandex.net (smtp4o.mail.yandex.net [2a02:6b8:0:1a2d::28]) by mxback16j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id tdYAWJFGet-0r3m7keW; Mon, 09 Oct 2017 17:00:53 +0300 Received: by smtp4o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id wSTIYzb9Br-0rdWL1pU; Mon, 09 Oct 2017 17:00:53 +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: Mon, 9 Oct 2017 17:00:12 +0300 Message-Id: <1507557617-32018-9-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507557617-32018-1-git-send-email-odpbot@yandex.ru> References: <1507557617-32018-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 188 Subject: [lng-odp] [PATCH v3 8/13] travis: fix netmap module loading 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 Travis script will insmod netmap.ko only it was rebuilt during this session, which is wrong. Split the ifs, so that module loading does not depend on the cache contents. Signed-off-by: Dmitry Eremin-Solenikov Reviewed-by: Bill Fischofer Signed-off-by: Maxim Uvarov --- /** Email created from pull request 188 (WonderfulVoid:master) ** https://github.com/Linaro/odp/pull/188 ** Patch: https://github.com/Linaro/odp/pull/188.patch ** Base sha: c16af6486eea240609f334b1bdc81a11404275de ** Merge commit sha: 4ad1d0615a4dcd74d4e9703090149eec1a58d7d2 **/ .travis.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5069ddff6..88cc3f4eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -167,13 +167,15 @@ install: # Netmap pktio - | - if [ -z "$CROSS_ARCH" -a ! -f "netmap/LINUX/netmap.ko" ]; then - 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 - sudo insmod ./netmap.ko - popd + if [ -z "$CROSS_ARCH" ]; then + if [ ! -f "netmap/LINUX/netmap.ko" ]; then + 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 + popd + fi + sudo insmod ./netmap/LINUX/netmap.ko fi script: