diff options
| author | Daniele Di Proietto <diproiettod@vmware.com> | 2016-08-04 10:23:08 -0700 |
|---|---|---|
| committer | Daniele Di Proietto <diproiettod@vmware.com> | 2016-08-05 13:59:36 -0700 |
| commit | e4f2c62126923b728477eef92398abb690b50873 (patch) | |
| tree | 17b3b7ece9b40399722f853fe94521d80e4debc7 | |
| parent | 5b1c9c789dd26088233b6417d4f40bfd103b46db (diff) | |
| download | openvswitch-e4f2c62126923b728477eef92398abb690b50873.tar.gz | |
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: ddcf96d2dcc1 ("system-tests: Disable offloads in userspace tests.")
Reported-by: Joe Stringer <joe@ovn.org>
Signed-off-by: Daniele Di Proietto <diproiettod@vmware.com>
Acked-by: Joe Stringer <joe@ovn.org>
| -rw-r--r-- | Vagrantfile | 2 | ||||
| -rw-r--r-- | tests/system-userspace-macros.at | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Vagrantfile b/Vagrantfile index fb06b42ff..843d88c9c 100644 --- 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 index 213425f9a..7e10b6c21 100644 --- 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() |