diff options
| author | Thadeu Lima de Souza Cascardo <cascardo@redhat.com> | 2016-05-23 21:57:52 -0300 |
|---|---|---|
| committer | Joe Stringer <joe@ovn.org> | 2016-06-01 10:37:46 -0700 |
| commit | a134d79dfb0efcc0095aaec03f3b001c01ba6057 (patch) | |
| tree | bf33e690f0a92fa59e53d8cd5b9e18e0f44d13a4 /tests/system-kmod-macros.at | |
| parent | 79a0e4b32c3c8834d4f8e7412a762cd9c50dc5f7 (diff) | |
| download | openvswitch-a134d79dfb0efcc0095aaec03f3b001c01ba6057.tar.gz | |
system-tests: fix module removal during cleanup
Currently, cleanup files for system tests will look like this:
modprobe -q -r vport_vxlan
modprobe -q -r vport_sttmodprobe
modprobe -q -r vport_lispmodprobe
modprobe -q -r vport_gremodprobe
modprobe -q -r vport_genevemodprobe
modprobe -r openvswitch
This is caused by a missing newline in m4_foreach EXPRESSION and the fact that
on_exit is a shell function. It was being expanded like this:
on_exit 'modprobe -q -r vport_genevemodprobe' -q vport_gre
Fixes: 53eb8cb83013 ("tests: Replace ON_EXIT m4 macro by on_exit() shell function.")
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@redhat.com>
Signed-off-by: Joe Stringer <joe@ovn.org>
Diffstat (limited to 'tests/system-kmod-macros.at')
| -rw-r--r-- | tests/system-kmod-macros.at | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at index 8e6092969..cee0510bd 100644 --- a/tests/system-kmod-macros.at +++ b/tests/system-kmod-macros.at @@ -20,7 +20,8 @@ m4_define([OVS_TRAFFIC_VSWITCHD_START], on_exit 'modprobe -r openvswitch' m4_foreach([mod], [[vport_geneve], [vport_gre], [vport_lisp], [vport_stt], [vport_vxlan]], [modprobe -q mod || echo "Module mod not loaded." - on_exit 'modprobe -q -r mod']) + on_exit 'modprobe -q -r mod' + ]) on_exit 'ovs-dpctl del-dp ovs-system' _OVS_VSWITCHD_START([]) dnl Add bridges, ports, etc. |