diff mbox series

[v3,1/1] travis: fix netmap module loading

Message ID 1507244409-362-2-git-send-email-odpbot@yandex.ru
State Superseded
Headers show
Series [v3,1/1] travis: fix netmap module loading | expand

Commit Message

Github ODP bot Oct. 5, 2017, 11 p.m. UTC 
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>

---
/** Email created from pull request 220 (lumag:fix-netmap)
 ** https://github.com/Linaro/odp/pull/220
 ** Patch: https://github.com/Linaro/odp/pull/220.patch
 ** Base sha: 52cfe7ba6d2541cf5ee464e46e91b2da5efe1497
 ** Merge commit sha: de27e5abdc9e16a982bec2ca4d4266b403285c50
 **/
 .travis.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/.travis.yml b/.travis.yml
index 395feb0ef..5d0325736 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: