From: changqingxwu <changqingx.wu@intel.com>
To: dts@dpdk.org
Cc: changqingxwu <changqingx.wu@intel.com>
Subject: [dts] [PATCH V1] tests/ipfrag: sed and regex of linux diff freebsd
Date: Mon, 29 Jul 2019 09:47:15 +0800 [thread overview]
Message-ID: <1564364835-115171-1-git-send-email-changqingx.wu@intel.com> (raw)
Signed-off-by: changqingxwu <changqingx.wu@intel.com>
---
tests/TestSuite_ipfrag.py | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/tests/TestSuite_ipfrag.py b/tests/TestSuite_ipfrag.py
index f6d0373..9d2a97d 100644
--- a/tests/TestSuite_ipfrag.py
+++ b/tests/TestSuite_ipfrag.py
@@ -116,8 +116,15 @@ l3fwd_ipv4_route_array[] = {\\\n"
rtLpmTbl[idx] = pat.sub(self.portRepl, rtLpmTbl[idx])
lpmStr_ipv6 = lpmStr_ipv6 + ' ' * 4 + rtLpmTbl[idx] + ",\\\n"
lpmStr_ipv6 = lpmStr_ipv6 + "};"
- self.dut.send_expect(r"sed -i '/l3fwd_ipv4_route_array\[\].*{/,/^\}\;/c\\%s' examples/ip_fragmentation/main.c" % lpmStr_ipv4, "# ")
- self.dut.send_expect(r"sed -i '/l3fwd_ipv6_route_array\[\].*{/,/^\}\;/c\\%s' examples/ip_fragmentation/main.c" % lpmStr_ipv6, "# ")
+
+ if self.dut.get_os_type() == "freebsd":
+ filename = "conf/0001-fix-ipfrag-failed-on-freeBSD.patch"
+ self.dut.session.copy_file_to(filename, self.dut.base_dir)
+ self.dut.send_expect("git apply 0001-fix-ipfrag-failed-on-freeBSD.patch", "#")
+ else:
+ self.dut.send_expect(r"sed -i '/l3fwd_ipv4_route_array\[\].*{/,/^\}\;/c\\%s' examples/ip_fragmentation/main.c" % lpmStr_ipv4, "# ")
+ self.dut.send_expect(r"sed -i '/l3fwd_ipv6_route_array\[\].*{/,/^\}\;/c\\%s' examples/ip_fragmentation/main.c" % lpmStr_ipv6, "# ")
+
# make application
out = self.dut.build_dpdk_apps("examples/ip_fragmentation")
self.verify("Error" not in out, "compilation error 1")
--
2.17.2
next reply other threads:[~2019-07-29 1:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-29 1:47 changqingxwu [this message]
2019-07-29 6:25 ` Ma, LihongX
2019-07-29 6:42 ` Wu, ChangqingX
2019-07-30 1:29 ` Ma, LihongX
2019-07-30 1:37 ` Wu, ChangqingX
2019-08-06 1:27 ` Wu, ChangqingX
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1564364835-115171-1-git-send-email-changqingx.wu@intel.com \
--to=changqingx.wu@intel.com \
--cc=dts@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).