projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lacp: Clean up LACP module interface.
[openvswitch]
/
tests
/
ofproto-macros.at
diff --git
a/tests/ofproto-macros.at
b/tests/ofproto-macros.at
index dc863e73f90b4bf632eabf914ffd3390a7c7caa1..24cb45a7dd9cfbeb23d0ce5fae5b85651cc3b1cf 100644
(file)
--- a/
tests/ofproto-macros.at
+++ b/
tests/ofproto-macros.at
@@
-5,10
+5,10
@@
m4_define([TESTABLE_LOG], [-vPATTERN:ANY:'%c|%p|%m'])
m4_define([OFPROTO_START],
[OVS_RUNDIR=$PWD; export OVS_RUNDIR
OVS_LOGDIR=$PWD; export OVS_LOGDIR
m4_define([OFPROTO_START],
[OVS_RUNDIR=$PWD; export OVS_RUNDIR
OVS_LOGDIR=$PWD; export OVS_LOGDIR
- trap 'kill `cat
ovs
-openflowd.pid`' 0
- AT_CAPTURE_FILE([
ovs
-openflowd.log])
+ trap 'kill `cat
test
-openflowd.pid`' 0
+ AT_CAPTURE_FILE([
test
-openflowd.log])
AT_CHECK(
AT_CHECK(
- [
ovs
-openflowd --detach --pidfile --enable-dummy --log-file --fail=closed dummy@br0 none --datapath-id=fedcba9876543210 $1],
+ [
test
-openflowd --detach --pidfile --enable-dummy --log-file --fail=closed dummy@br0 none --datapath-id=fedcba9876543210 $1],
[0], [], [stderr])
AT_CHECK([[sed < stderr '
/vlog|INFO|opened log file/d
[0], [], [stderr])
AT_CHECK([[sed < stderr '
/vlog|INFO|opened log file/d
@@
-19,5
+19,5
@@
m4_define([OFPROTO_START],
])
m4_define([OFPROTO_STOP],
])
m4_define([OFPROTO_STOP],
- [AT_CHECK([ovs-appctl -t
ovs
-openflowd exit])
+ [AT_CHECK([ovs-appctl -t
test
-openflowd exit])
trap '' 0])
trap '' 0])