[ovs-dev,1/8] travis: Fix building datapath instead of userspace with DPDK_SHARED.

Message ID 20190208164900.30679-2-i.maximets@samsung.com
State Accepted
Headers show
Series
  • travis: Fix equal distcheck runs.
Related show

Commit Message

Ilya Maximets Feb. 8, 2019, 4:48 p.m.
Current script does not check build of OVS with DPDK.
It builds datapath instead.

CC: Ian Stokes <ian.stokes@intel.com>
Fixes: edfe8d263d2e ("travis: Add dpdk shared library build.")
Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
Acked-by: Aaron Conole <aconole@redhat.com>
---
 .travis/linux-build.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Ian Stokes Feb. 12, 2019, 3:52 p.m. | #1
On 2/8/2019 4:48 PM, Ilya Maximets wrote:
> Current script does not check build of OVS with DPDK.
> It builds datapath instead.
> 
> CC: Ian Stokes <ian.stokes@intel.com>
> Fixes: edfe8d263d2e ("travis: Add dpdk shared library build.")
> Signed-off-by: Ilya Maximets <i.maximets@samsung.com>
> Acked-by: Aaron Conole <aconole@redhat.com>

Ben has applied this to master already but I've just backported this to 
OVS 2.11 also as it is of use there too.

Thanks
Ian

Patch

diff --git a/.travis/linux-build.sh b/.travis/linux-build.sh
index 9d177aa1b..8c931ebc5 100755
--- a/.travis/linux-build.sh
+++ b/.travis/linux-build.sh
@@ -43,7 +43,7 @@  function install_kernel()
     fi
 
     KERNELSRC=$(pwd)
-    if [ ! "$DPDK" ]; then
+    if [ ! "$DPDK" ] && [ ! "$DPDK_SHARED" ]; then
         EXTRA_OPTS="--with-linux=$(pwd)"
     fi
     echo "Installed kernel source in $(pwd)"
@@ -106,7 +106,8 @@  configure_ovs $EXTRA_OPTS $*
 make selinux-policy
 
 # Only build datapath if we are testing kernel w/o running testsuite
-if [ "$KERNEL" ] && [ ! "$TESTSUITE" ] && [ ! "$DPDK" ]; then
+if [ "$KERNEL" ] && [ ! "$TESTSUITE" ] && \
+   [ ! "$DPDK" ] && [ ! "$DPDK_SHARED" ]; then
     cd datapath
 fi