projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
meta-flow: Rename MFF_VLAN_VID->MFF_DL_VLAN, MFF_VLAN_PCP->MFF_DL_VLAN_PCP.
[openvswitch]
/
tests
/
ofproto-macros.at
diff --git
a/tests/ofproto-macros.at
b/tests/ofproto-macros.at
index a7ac388d937ed8c12e4d94b0f85e8d2e69c4b94d..e7d6da4d89c689f3143aa4106b2e92f7f9caebb4 100644
(file)
--- a/
tests/ofproto-macros.at
+++ b/
tests/ofproto-macros.at
@@
-10,8
+10,8
@@
s/ cookie=0x0,//
s/ table=0,//
s/ n_packets=0,//
s/ n_bytes=0,//
s/ table=0,//
s/ n_packets=0,//
s/ n_bytes=0,//
-s/idle_age=[0-9]*,//
-s/hard_age=[0-9]*,//
+s/
idle_age=[0-9]*,//
+s/
hard_age=[0-9]*,//
'
}]
m4_divert_pop([PREPARE_TESTS])
'
}]
m4_divert_pop([PREPARE_TESTS])
@@
-41,7
+41,9
@@
m4_define([OVS_VSWITCHD_START],
dnl Start ovsdb-server.
AT_CHECK([ovsdb-server --detach --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock], [0], [], [stderr])
dnl Start ovsdb-server.
AT_CHECK([ovsdb-server --detach --pidfile --log-file --remote=punix:$OVS_RUNDIR/db.sock], [0], [], [stderr])
- AT_CHECK([[sed < stderr '/vlog|INFO|opened log file/d']])
+ AT_CHECK([[sed < stderr '
+/vlog|INFO|opened log file/d
+/ovsdb_server|INFO|ovsdb-server (Open vSwitch)/d']])
AT_CAPTURE_FILE([ovsdb-server.log])
dnl Initialize database.
AT_CAPTURE_FILE([ovsdb-server.log])
dnl Initialize database.
@@
-52,6
+54,7
@@
m4_define([OVS_VSWITCHD_START],
AT_CAPTURE_FILE([ovs-vswitchd.log])
AT_CHECK([[sed < stderr '
/vlog|INFO|opened log file/d
AT_CAPTURE_FILE([ovs-vswitchd.log])
AT_CHECK([[sed < stderr '
/vlog|INFO|opened log file/d
+/vswitchd|INFO|ovs-vswitchd (Open vSwitch)/d
/reconnect|INFO|/d
/ofproto|INFO|using datapath ID/d
/ofproto|INFO|datapath ID changed to fedcba9876543210/d']])
/reconnect|INFO|/d
/ofproto|INFO|using datapath ID/d
/ofproto|INFO|datapath ID changed to fedcba9876543210/d']])