aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>2017-10-05 20:36:20 +0300
committerMaxim Uvarov <maxim.uvarov@linaro.org>2017-10-06 10:17:09 +0300
commita63f25ff2994b2df78c24f1f8b63d0e06628eb68 (patch)
tree8ba0a3d9192f69c2f34fb0b3c9096010af2eb6e2
parent34884aa91524c4329e4ea1a9b312538d8f7dd187 (diff)
travis: fix netmap module loading
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>
-rw-r--r--.travis.yml16
1 files 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: