On 5 February 2015 at 16:06, Andy Zhou <az...@nicira.com> wrote: > # commands to delete any warnings that are actually expected, e.g.: > # > # OVS_KMOD_VSWITCHD_STOP(["/expected error/d"]) > +# > +# 'extra_cmds' are shell commands to be executed afte OVS_VSWITCHD_STOP() is > +# invoked. They can be used to perform additional cleanups such as name space > +# removal. > m4_define([OVS_KMOD_VSWITCHD_STOP], > [AT_CHECK([ovs-vsctl del-br br0]) > OVS_VSWITCHD_STOP([$1]) > AT_CHECK([modprobe -r openvswitch]) > + AT_CHECK([:; $2]) > ])
OK, I understand now. This command should be above the modprobe -r. > -DEL_NAMESPACES(at_ns0, at_ns1) > -OVS_KMOD_VSWITCHD_STOP > +OVS_KMOD_VSWITCHD_STOP([], DEL_NAMESPACES(at_ns0, at_ns1)) > AT_CLEANUP I'm not terribly fond of passing this extra command into the VSWITCHD_STOP, but it's solving a problem right now, so I'll welcome the incremental improvement. Perhaps in future, we can assemble the 'cleanup' file with all of the cleanup to perform in the correct order, then during graceful test shutdown reuse those commands and clear the cleanup file. With the fix above: Acked-by: Joe Stringer <joestrin...@nicira.com> _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
