Message ID | 20180822133736.10768-5-aconole@redhat.com |
---|---|
State | Changes Requested |
Delegated to: | Ian Stokes |
Headers | show |
Series | system-dpdk: add support to ping two namespaces | expand |
On 8/22/2018 2:37 PM, Aaron Conole wrote: > The default marker for sed commands according to the manual is /, but this > is inconvenient when working with paths. The solution is either to escape > all instances of / or use sed's \cREGEXc feature. LGTM, Ian > > Signed-off-by: Aaron Conole <aconole@redhat.com> > --- > tests/system-dpdk.at | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/tests/system-dpdk.at b/tests/system-dpdk.at > index 723ba794f..834ba06fb 100644 > --- a/tests/system-dpdk.at > +++ b/tests/system-dpdk.at > @@ -65,12 +65,12 @@ AT_CHECK([grep "VHOST_CONFIG: /tmp/dpdkvhostclient0: reconnecting..." ovs-vswitc > > dnl Clean up > AT_CHECK([ovs-vsctl del-port br10 dpdkvhostuserclient0], [], [stdout], [stderr]) > -OVS_VSWITCHD_STOP(["/does not exist. The Open vSwitch kernel module is probably not loaded./d > -/Failed to enable flow control/d > -/failed to connect to \/tmp\/dpdkvhostclient0: No such file or directory/d > -/Global register is changed during/d > -/EAL: Invalid NUMA socket, default to 0/d > -/EAL: WARNING: cpu flags constant_tsc=yes nonstop_tsc=no -> using unreliable clock cycles !/d > -/EAL: No free hugepages reported in hugepages-1048576kB/d"]) > +OVS_VSWITCHD_STOP(["\@does not exist. The Open vSwitch kernel module is probably not loaded.@d > +\@Failed to enable flow control@d > +\@VHOST_CONFIG: failed to connect to /tmp/dpdkvhostclient0: No such file or directory@d > +\@Global register is changed during@d > +\@EAL: Invalid NUMA socket, default to 0@d > +\@EAL: WARNING: cpu flags constant_tsc=yes nonstop_tsc=no -> using unreliable clock cycles !@d > +\@EAL: No free hugepages reported in hugepages-1048576kB@d"]) > AT_CLEANUP > dnl -------------------------------------------------------------------------- >
diff --git a/tests/system-dpdk.at b/tests/system-dpdk.at index 723ba794f..834ba06fb 100644 --- a/tests/system-dpdk.at +++ b/tests/system-dpdk.at @@ -65,12 +65,12 @@ AT_CHECK([grep "VHOST_CONFIG: /tmp/dpdkvhostclient0: reconnecting..." ovs-vswitc dnl Clean up AT_CHECK([ovs-vsctl del-port br10 dpdkvhostuserclient0], [], [stdout], [stderr]) -OVS_VSWITCHD_STOP(["/does not exist. The Open vSwitch kernel module is probably not loaded./d -/Failed to enable flow control/d -/failed to connect to \/tmp\/dpdkvhostclient0: No such file or directory/d -/Global register is changed during/d -/EAL: Invalid NUMA socket, default to 0/d -/EAL: WARNING: cpu flags constant_tsc=yes nonstop_tsc=no -> using unreliable clock cycles !/d -/EAL: No free hugepages reported in hugepages-1048576kB/d"]) +OVS_VSWITCHD_STOP(["\@does not exist. The Open vSwitch kernel module is probably not loaded.@d +\@Failed to enable flow control@d +\@VHOST_CONFIG: failed to connect to /tmp/dpdkvhostclient0: No such file or directory@d +\@Global register is changed during@d +\@EAL: Invalid NUMA socket, default to 0@d +\@EAL: WARNING: cpu flags constant_tsc=yes nonstop_tsc=no -> using unreliable clock cycles !@d +\@EAL: No free hugepages reported in hugepages-1048576kB@d"]) AT_CLEANUP dnl --------------------------------------------------------------------------
The default marker for sed commands according to the manual is /, but this is inconvenient when working with paths. The solution is either to escape all instances of / or use sed's \cREGEXc feature. Signed-off-by: Aaron Conole <aconole@redhat.com> --- tests/system-dpdk.at | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)