diff options
| author | Ben Pfaff <blp@nicira.com> | 2015-09-09 10:26:11 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2015-09-09 10:28:20 -0700 |
| commit | 53eb8cb830133f00c945aabd92455da238620d8c (patch) | |
| tree | 4388e614576dfa72efdf0f64a2ec1b025dec75e7 /tests/ovn-controller-vtep.at | |
| parent | 6132b241efd21160db57d9908ee630a215cce8ea (diff) | |
| download | openvswitch-53eb8cb830133f00c945aabd92455da238620d8c.tar.gz | |
tests: Replace ON_EXIT m4 macro by on_exit() shell function.
A shell function doesn't need quoted and unquoted variants and it
integrates naturally with other shell code.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Andy Zhou <azhou@nicira.com>
Diffstat (limited to 'tests/ovn-controller-vtep.at')
| -rw-r--r-- | tests/ovn-controller-vtep.at | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/ovn-controller-vtep.at b/tests/ovn-controller-vtep.at index 83badf955..5db9a3507 100644 --- a/tests/ovn-controller-vtep.at +++ b/tests/ovn-controller-vtep.at @@ -24,7 +24,7 @@ m4_define([OVN_CONTROLLER_VTEP_START], dnl Start ovsdb-server. AT_CHECK([ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock vswitchd.db vtep.db ovn-nb.db ovn-sb.db], [0], [], [stderr]) - ON_EXIT_UNQUOTED([kill `cat ovsdb-server.pid`]) + on_exit "kill `cat ovsdb-server.pid`" AT_CHECK([[sed < stderr ' /vlog|INFO|opened log file/d /ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d']]) @@ -33,7 +33,7 @@ m4_define([OVN_CONTROLLER_VTEP_START], dnl Start ovs-vswitchd. AT_CHECK([ovs-vswitchd --enable-dummy --disable-system --detach --no-chdir --pidfile --log-file -vvconn -vofproto_dpif], [0], [], [stderr]) AT_CAPTURE_FILE([ovs-vswitchd.log]) - ON_EXIT_UNQUOTED([kill `cat ovs-vswitchd.pid`]) + on_exit "kill `cat ovs-vswitchd.pid`" AT_CHECK([[sed < stderr ' /ovs_numa|INFO|Discovered /d /vlog|INFO|opened log file/d @@ -49,7 +49,7 @@ m4_define([OVN_CONTROLLER_VTEP_START], dnl Start ovs-vtep. AT_CHECK([vtep-ctl add-ps br-vtep -- set Physical_Switch br-vtep tunnel_ips=1.2.3.4]) AT_CHECK([ovs-vtep --log-file=ovs-vtep.log --pidfile=ovs-vtep.pid --detach br-vtep \], [0], [], [stderr]) - ON_EXIT_UNQUOTED([kill `cat ovs-vtep.pid`]) + on_exit "kill `cat ovs-vtep.pid`" AT_CHECK([[sed < stderr ' /vlog|INFO|opened log file/d']]) # waits until ovs-vtep starts up. @@ -58,7 +58,7 @@ m4_define([OVN_CONTROLLER_VTEP_START], dnl Start ovn-northd. AT_CHECK([ovn-nbctl lswitch-add br-test]) AT_CHECK([ovn-northd --detach --pidfile --log-file --ovnnb-db=unix:$OVS_RUNDIR/db.sock --ovnsb-db=unix:$OVS_RUNDIR/db.sock], [0], [], [stderr]) - ON_EXIT_UNQUOTED([kill `cat ovn-northd.pid`]) + on_exit "kill `cat ovn-northd.pid`" AT_CHECK([[sed < stderr ' /vlog|INFO|opened log file/d']]) AT_CAPTURE_FILE([ovn-northd.log]) @@ -66,7 +66,7 @@ m4_define([OVN_CONTROLLER_VTEP_START], dnl Start ovn-controllger-vtep. AT_CHECK([ovn-controller-vtep --detach --pidfile --log-file --vtep-db=unix:$OVS_RUNDIR/db.sock --ovnsb-db=unix:$OVS_RUNDIR/db.sock], [0], [], [stderr]) AT_CAPTURE_FILE([ovn-controller-vtep.log]) - ON_EXIT_UNQUOTED([kill `cat ovn-controller-vtep.pid`]) + on_exit "kill `cat ovn-controller-vtep.pid`" AT_CHECK([[sed < stderr ' /vlog|INFO|opened log file/d /reconnect|INFO|/d']]) |