Message ID | 1518806562-20296-1-git-send-email-u9012063@gmail.com |
---|---|
State | Accepted |
Headers | show |
Series | [ovs-dev] odp.at: fix sed string matching typo. | expand |
On Fri, Feb 16, 2018 at 10:42:42AM -0800, William Tu wrote: > Replace 'set' with 'sed'. > > Signed-off-by: William Tu <u9012063@gmail.com> > --- > tests/odp.at | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tests/odp.at b/tests/odp.at > index ea8f40ede78b..cdf3d6645ea4 100644 > --- a/tests/odp.at > +++ b/tests/odp.at > @@ -30,9 +30,9 @@ in_port(1),eth(src=00:01:02:03:04:05,dst=10:11:12:13:14:15),eth_type(0x8848),mpl > ]) > > (echo '# Valid forms without tun_id or VLAN header.' > - set 's/^/skb_priority(0),skb_mark(0),recirc_id(0),dp_hash(0),/' odp-base.txt > + sed 's/^/skb_priority(0),skb_mark(0),recirc_id(0),dp_hash(0),/' odp-base.txt > > - set ' > + sed ' > s/^/skb_priority(0),skb_mark(0),recirc_id(0),dp_hash(0),/ > ' odp-base.txt How does the test pass both with and without this change? Is there a bigger bug here?
On Fri, Feb 16, 2018 at 3:12 PM, Ben Pfaff <blp@ovn.org> wrote: > On Fri, Feb 16, 2018 at 10:42:42AM -0800, William Tu wrote: >> Replace 'set' with 'sed'. >> >> Signed-off-by: William Tu <u9012063@gmail.com> >> --- >> tests/odp.at | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/tests/odp.at b/tests/odp.at >> index ea8f40ede78b..cdf3d6645ea4 100644 >> --- a/tests/odp.at >> +++ b/tests/odp.at >> @@ -30,9 +30,9 @@ in_port(1),eth(src=00:01:02:03:04:05,dst=10:11:12:13:14:15),eth_type(0x8848),mpl >> ]) >> >> (echo '# Valid forms without tun_id or VLAN header.' >> - set 's/^/skb_priority(0),skb_mark(0),recirc_id(0),dp_hash(0),/' odp-base.txt >> + sed 's/^/skb_priority(0),skb_mark(0),recirc_id(0),dp_hash(0),/' odp-base.txt >> >> - set ' >> + sed ' >> s/^/skb_priority(0),skb_mark(0),recirc_id(0),dp_hash(0),/ >> ' odp-base.txt > > How does the test pass both with and without this change? Is there a > bigger bug here? Without this patch, the string "skb_priority(0),skb_mark(0),recirc_id(0),dp_hash(0)," is not added to the odp-base.txt. As a result we do not test this odp format, so it passes. William
On Fri, Feb 16, 2018 at 03:15:43PM -0800, William Tu wrote: > On Fri, Feb 16, 2018 at 3:12 PM, Ben Pfaff <blp@ovn.org> wrote: > > On Fri, Feb 16, 2018 at 10:42:42AM -0800, William Tu wrote: > >> Replace 'set' with 'sed'. > >> > >> Signed-off-by: William Tu <u9012063@gmail.com> > >> --- > >> tests/odp.at | 4 ++-- > >> 1 file changed, 2 insertions(+), 2 deletions(-) > >> > >> diff --git a/tests/odp.at b/tests/odp.at > >> index ea8f40ede78b..cdf3d6645ea4 100644 > >> --- a/tests/odp.at > >> +++ b/tests/odp.at > >> @@ -30,9 +30,9 @@ in_port(1),eth(src=00:01:02:03:04:05,dst=10:11:12:13:14:15),eth_type(0x8848),mpl > >> ]) > >> > >> (echo '# Valid forms without tun_id or VLAN header.' > >> - set 's/^/skb_priority(0),skb_mark(0),recirc_id(0),dp_hash(0),/' odp-base.txt > >> + sed 's/^/skb_priority(0),skb_mark(0),recirc_id(0),dp_hash(0),/' odp-base.txt > >> > >> - set ' > >> + sed ' > >> s/^/skb_priority(0),skb_mark(0),recirc_id(0),dp_hash(0),/ > >> ' odp-base.txt > > > > How does the test pass both with and without this change? Is there a > > bigger bug here? > > Without this patch, the string > "skb_priority(0),skb_mark(0),recirc_id(0),dp_hash(0)," is not added to > the odp-base.txt. > As a result we do not test this odp format, so it passes. Ah-hah, that makes sense! Thanks, I applied this to master.
diff --git a/tests/odp.at b/tests/odp.at index ea8f40ede78b..cdf3d6645ea4 100644 --- a/tests/odp.at +++ b/tests/odp.at @@ -30,9 +30,9 @@ in_port(1),eth(src=00:01:02:03:04:05,dst=10:11:12:13:14:15),eth_type(0x8848),mpl ]) (echo '# Valid forms without tun_id or VLAN header.' - set 's/^/skb_priority(0),skb_mark(0),recirc_id(0),dp_hash(0),/' odp-base.txt + sed 's/^/skb_priority(0),skb_mark(0),recirc_id(0),dp_hash(0),/' odp-base.txt - set ' + sed ' s/^/skb_priority(0),skb_mark(0),recirc_id(0),dp_hash(0),/ ' odp-base.txt
Replace 'set' with 'sed'. Signed-off-by: William Tu <u9012063@gmail.com> --- tests/odp.at | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)