diff mbox series

[v4,5/5] travis: move --with-dpdk-path out of DPDK build if

Message ID 1516489211-26156-6-git-send-email-odpbot@yandex.ru
State Superseded
Headers show
Series [v4,1/5] travis: stop early when installation of cross-packages has failed | expand

Commit Message

Github ODP bot Jan. 20, 2018, 11 p.m. UTC 
From: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>


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.

Fixes: 1b285bbdd1abbec9853e1bc51bdb6ee02643b1a7
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>

---
/** Email created from pull request 412 (lumag:travis-upd)
 ** https://github.com/Linaro/odp/pull/412
 ** Patch: https://github.com/Linaro/odp/pull/412.patch
 ** Base sha: 5a4502fc6bc53e6503169da3028f456b64811a0b
 ** Merge commit sha: 15e457a4db3005d5fe8a7847e25657675bcc88ce
 **/
 .travis.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/.travis.yml b/.travis.yml
index 666b56eed..bad1eba19 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -196,7 +196,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
@@ -220,7 +221,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