system-userspace-macros: Check the exit code of ethtool.

If the ethtool command is not available on the system we should fail, since the userspace testsuite cannot work properly without disabling offloads. Also, add ethtool to the list of installed packages on Vagrantfile, to ensure that offloads don't cause test failures in the vagrant VM when the kernel is updated. Fixes: ddcf96d ("system-tests: Disable offloads in userspace tests.") Reported-by: Joe Stringer <[email protected]> Signed-off-by: Daniele Di Proietto <[email protected]> Acked-by: Joe Stringer <[email protected]>
nicboul · Aug 5, 2016 · e4f2c62 · e4f2c62
1 parent 5b1c9c7
commit e4f2c62
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Vagrantfile b/Vagrantfile
@@ -11,7 +11,7 @@ dnf -y install autoconf automake openssl-devel libtool \
                python-twisted-core python-zope-interface \
                desktop-file-utils groff graphviz rpmdevtools nc \
                wget python-six pyftpdlib checkpolicy selinux-policy-devel \
-               libcap-ng-devel kernel-devel-`uname -r`
+               libcap-ng-devel kernel-devel-`uname -r` ethtool
 echo "search extra update built-in" >/etc/depmod.d/search_path.conf
 cd /vagrant
 ./boot.sh

diff --git a/tests/system-userspace-macros.at b/tests/system-userspace-macros.at
@@ -55,7 +55,7 @@ m4_define([OVS_TRAFFIC_VSWITCHD_STOP],
 # This is a workaround, and should be removed when offloads are properly
 # supported in netdev-linux.
 m4_define([CONFIGURE_VETH_OFFLOADS],
-    [ethtool -K $1 tx off]
+    [AT_CHECK([ethtool -K $1 tx off], [0], [ignore])]
 )
 
 # CHECK_CONNTRACK()