From: Daniele Di Proietto Date: Tue, 7 Jun 2016 00:05:49 +0000 (-0700) Subject: tests: Allow extra cmd line args to OVS_VSWITCHD_START. X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fovs.git;a=commitdiff_plain;h=f7cfe5c2445f94f90fb7dbff6403f2c6de9596dc tests: Allow extra cmd line args to OVS_VSWITCHD_START. This will be used by a following commit, to add dummy-numa options. Signed-off-by: Daniele Di Proietto Acked-by: Ilya Maximets --- diff --git a/tests/ofproto-macros.at b/tests/ofproto-macros.at index 632f74734..105d9cad3 100644 --- a/tests/ofproto-macros.at +++ b/tests/ofproto-macros.at @@ -285,7 +285,8 @@ m4_define([_OVS_VSWITCHD_START], /dpdk|INFO|DPDK Disabled - to change this requires a restart./d']]) ]) -# OVS_VSWITCHD_START([vsctl-args], [vsctl-output], [=override]) +# OVS_VSWITCHD_START([vsctl-args], [vsctl-output], [=override], +# [vswitchd-aux-args]) # # Creates a database and starts ovsdb-server, starts ovs-vswitchd # connected to that database, calls ovs-vsctl to create a bridge named @@ -298,8 +299,11 @@ m4_define([_OVS_VSWITCHD_START], # =override (literally) as the third argument. Otherwise, system devices # won't work at all (which makes sense because tests should not access a # system's real Ethernet devices). +# +# 'vswitchd-aux-args' provides a way to pass extra command line arguments +# to ovs-vswitchd m4_define([OVS_VSWITCHD_START], - [_OVS_VSWITCHD_START([--enable-dummy$3 --disable-system]) + [_OVS_VSWITCHD_START([--enable-dummy$3 --disable-system $4]) AT_CHECK([add_of_br 0 $1 m4_if([$2], [], [], [| ${PERL} $srcdir/uuidfilt.pl])], [0], [$2]) ])