[v3,8/13] travis: fix netmap module loading

Message ID 1507557617-32018-9-git-send-email-odpbot@yandex.ru
State New
Headers show
Series
  • test: Increase scalability and performance of odp_pktio_perf
Related show

Commit Message

Github ODP bot Oct. 9, 2017, 2 p.m.
From: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>


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 <dmitry.ereminsolenikov@linaro.org>

Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org>

Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

---
/** 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(-)

Patch

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: