[ovs-dev] [PATCH] odp.at: Make 'sed -i' BSD compatible.

Ilya Maximets i.maximets at samsung.com
Wed Dec 19 15:00:20 UTC 2018


'sed -i' on FreeBSD always expects backup filename extention
passed while GNU version expects it only if specified without
extra space after the '-i'. Let's specify the backup extention
to make BSD sed work.
This fixes test on FreeBSD.

CC: Joe Stringer <joe at ovn.org>
Fixes: 07659514c3c1 ("Add support for connection tracking.")
Signed-off-by: Ilya Maximets <i.maximets at samsung.com>
---
 tests/odp.at | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/odp.at b/tests/odp.at
index 96b4b47dc..86a918e66 100644
--- a/tests/odp.at
+++ b/tests/odp.at
@@ -100,9 +100,9 @@ s/^/ODP_FIT_TOO_LITTLE: /
 
 dnl Some fields are always printed for this test, because wildcards aren't
 dnl specified. We can skip these.
-sed -i 's/\(skb_mark(0)\),\(ct\)/\1,ct_state(0),ct_zone(0),\2/' odp-out.txt
-sed -i 's/\(skb_mark([[^)]]*)\),\(recirc\)/\1,ct_state(0),ct_zone(0),ct_mark(0),ct_label(0),\2/' odp-out.txt
-sed -i 's/\(in_port(1)\),\(eth\)/\1,packet_type(ns=0,id=0),\2/' odp-out.txt
+sed -i'back' 's/\(skb_mark(0)\),\(ct\)/\1,ct_state(0),ct_zone(0),\2/' odp-out.txt
+sed -i'back' 's/\(skb_mark([[^)]]*)\),\(recirc\)/\1,ct_state(0),ct_zone(0),ct_mark(0),ct_label(0),\2/' odp-out.txt
+sed -i'back' 's/\(in_port(1)\),\(eth\)/\1,packet_type(ns=0,id=0),\2/' odp-out.txt
 
 AT_CHECK_UNQUOTED([ovstest test-odp parse-keys < odp-in.txt], [0], [`cat odp-out.txt`
 ])
-- 
2.17.1



More information about the dev mailing list