From: xizhan4x <xix.zhang@intel.com>
To: dts@dpdk.org
Cc: xizhan4x <xix.zhang@intel.com>
Subject: [dts] [PATCH V1] tests/TestSuite_vxlan/TestSuite_nvgre:Meson default RTE_ IXGBE_ INC_ VECTOR is n
Date: Thu, 24 Sep 2020 17:34:10 +0800 [thread overview]
Message-ID: <1600940050-3782-1-git-send-email-xix.zhang@intel.com> (raw)
Meson default RTE_IXGBE_ INC_ VECTOR is n , so skip compilation
Signed-off-by: xizhan4x <xix.zhang@intel.com>
---
tests/TestSuite_nvgre.py | 67 +++++++++++++++++++++++++---------------------
tests/TestSuite_vxlan.py | 69 +++++++++++++++++++++++++++---------------------
2 files changed, 76 insertions(+), 60 deletions(-)
diff --git a/tests/TestSuite_nvgre.py b/tests/TestSuite_nvgre.py
index e81b370..b36dc38 100644
--- a/tests/TestSuite_nvgre.py
+++ b/tests/TestSuite_nvgre.py
@@ -468,7 +468,9 @@ class TestNvgre(TestCase):
config.outer_mac_dst = self.dut_rx_port_mac
config.create_pcap()
self.dut.send_expect("start", "testpmd>", 10)
+ time.sleep(3)
config.send_pcap()
+ time.sleep(2)
# check whether detect nvgre type
out = self.dut.get_session_output()
print(out)
@@ -513,7 +515,9 @@ class TestNvgre(TestCase):
# send nvgre packet
config.create_pcap()
self.dut.send_expect("start", "testpmd>", 10)
+ time.sleep(3)
config.send_pcap()
+ time.sleep(2)
out = self.dut.get_session_output()
print(out)
queue = -1
@@ -581,12 +585,11 @@ class TestNvgre(TestCase):
self.logger.info("nvgre packet %s" % arg_str)
out = self.dut.send_expect("start", "testpmd>", 10)
-
+ time.sleep(5)
# create pcap file with supplied arguments
config = NvgreTestConfig(self, **kwargs)
config.outer_mac_dst = self.dut_rx_port_mac
config.create_pcap()
-
# remove temporary files
self.tester.send_expect("rm -rf %s" % config.capture_file, "# ")
# save the capture packet into pcap format
@@ -627,13 +630,14 @@ class TestNvgre(TestCase):
print("CVL support default none VECTOR")
src_vec_model = 'n'
else:
- out = self.dut.send_expect("cat config/common_base", "]# ", 10)
- src_vec_model = re.findall("%s=." % self.compile_switch, out)[0][-1]
- if src_vec_model == 'y':
- self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch
- + "%s=n/' config/common_base" % self.compile_switch, "# ", 30)
- self.dut.skip_setup = False
- self.dut.build_install_dpdk(self.target)
+ if self.dut.build_type != "meson":
+ out = self.dut.send_expect("cat config/common_base", "]# ", 10)
+ src_vec_model = re.findall("%s=." % self.compile_switch, out)[0][-1]
+ if src_vec_model == 'y':
+ self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch
+ + "%s=n/' config/common_base" % self.compile_switch, "# ", 30)
+ self.dut.skip_setup = False
+ self.dut.build_install_dpdk(self.target)
# check no nvgre packet
self.nvgre_detect(outer_l3_type = "IPv6", outer_ip_proto=0xFF)
@@ -653,13 +657,14 @@ class TestNvgre(TestCase):
print("CVL support default none VECTOR")
src_vec_model = 'n'
else:
- out = self.dut.send_expect("cat config/common_base", "]# ", 10)
- dst_vec_model = re.findall("%s=." % self.compile_switch, out)[0][-1]
- if src_vec_model != dst_vec_model:
- self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch
- + "%s=%s/' config/common_base" % (self.compile_switch, src_vec_model), "# ", 30)
- self.dut.skip_setup = False
- self.dut.build_install_dpdk(self.target)
+ if self.dut.build_type != "meson":
+ out = self.dut.send_expect("cat config/common_base", "]# ", 10)
+ dst_vec_model = re.findall("%s=." % self.compile_switch, out)[0][-1]
+ if src_vec_model != dst_vec_model:
+ self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch
+ + "%s=%s/' config/common_base" % (self.compile_switch, src_vec_model), "# ", 30)
+ self.dut.skip_setup = False
+ self.dut.build_install_dpdk(self.target)
def test_nvgre_ipv6_checksum_offload(self):
# check nvgre packet + inner IPv6 + inner L4 invalid
@@ -702,13 +707,14 @@ class TestNvgre(TestCase):
print("CVL support default none VECTOR")
src_vec_model = 'n'
else:
- out = self.dut.send_expect("cat config/common_base", "]# ", 10)
- src_vec_model = re.findall("%s=." % self.compile_switch, out)[0][-1]
- if src_vec_model == 'y':
- self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch
- + "%s=n/' config/common_base" % self.compile_switch, "# ", 30)
- self.dut.skip_setup = False
- self.dut.build_install_dpdk(self.target)
+ if self.dut.build_type != "meson":
+ out = self.dut.send_expect("cat config/common_base", "]# ", 10)
+ src_vec_model = re.findall("%s=." % self.compile_switch, out)[0][-1]
+ if src_vec_model == 'y':
+ self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch
+ + "%s=n/' config/common_base" % self.compile_switch, "# ", 30)
+ self.dut.skip_setup = False
+ self.dut.build_install_dpdk(self.target)
# check no nvgre packet
self.nvgre_detect(outer_ip_proto=0xFF)
@@ -726,13 +732,14 @@ class TestNvgre(TestCase):
print("CVL support default none VECTOR")
src_vec_model = 'n'
else:
- out = self.dut.send_expect("cat config/common_base", "]# ", 10)
- dst_vec_model = re.findall("%s=." % self.compile_switch, out)[0][-1]
- if src_vec_model != dst_vec_model:
- self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch
- + "%s=%s/' config/common_base" % (self.compile_switch, src_vec_model), "# ", 30)
- self.dut.skip_setup = False
- self.dut.build_install_dpdk(self.target)
+ if self.dut.build_type != "meson":
+ out = self.dut.send_expect("cat config/common_base", "]# ", 10)
+ dst_vec_model = re.findall("%s=." % self.compile_switch, out)[0][-1]
+ if src_vec_model != dst_vec_model:
+ self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch
+ + "%s=%s/' config/common_base" % (self.compile_switch, src_vec_model), "# ", 30)
+ self.dut.skip_setup = False
+ self.dut.build_install_dpdk(self.target)
def test_tunnel_filter(self):
# verify tunnel filter feature
diff --git a/tests/TestSuite_vxlan.py b/tests/TestSuite_vxlan.py
index d6cd93c..58a1119 100644
--- a/tests/TestSuite_vxlan.py
+++ b/tests/TestSuite_vxlan.py
@@ -382,9 +382,11 @@ class TestVxlan(TestCase, IxiaPacketGenerator):
config.outer_mac_dst = self.dut_port_mac
config.create_pcap()
self.dut.send_expect("start", "testpmd>", 10)
+ time.sleep(3)
config.send_pcap(self.tester_iface)
# check whether detect vxlan type
+ time.sleep(2)
out = self.dut.get_session_output(timeout=2)
print(out)
self.verify(config.packet_type() in out, "Vxlan Packet not detected")
@@ -438,15 +440,16 @@ class TestVxlan(TestCase, IxiaPacketGenerator):
self.logger.info("vxlan packet %s" % arg_str)
out = self.dut.send_expect("start", "testpmd>", 10)
-
+ time.sleep(3)
# create pcap file with supplied arguments
config = VxlanTestConfig(self, **kwargs)
config.outer_mac_dst = self.dut_port_mac
config.create_pcap()
-
# save the capture packet into pcap format
inst = self.tester.tcpdump_sniff_packets(self.recv_iface)
+ time.sleep(2)
config.send_pcap(self.tester_iface)
+ time.sleep(2)
pkt = self.tester.load_tcpdump_sniff_packets(inst, timeout=3)
# extract the checksum offload from saved pcap file
@@ -505,7 +508,9 @@ class TestVxlan(TestCase, IxiaPacketGenerator):
# send vxlan packet
config.create_pcap()
self.dut.send_expect("start", "testpmd>", 10)
+ time.sleep(2)
config.send_pcap(self.tester_iface)
+ time.sleep(2)
out = self.dut.get_session_output(timeout=2)
print(out)
@@ -528,13 +533,14 @@ class TestVxlan(TestCase, IxiaPacketGenerator):
print("CVL support default none VECTOR")
src_vec_model = 'n'
else:
- out = self.dut.send_expect("cat config/common_base", "]# ", 10)
- src_vec_model = re.search("%s=." % self.compile_switch, out).group()[-1]
- if src_vec_model == 'y':
- self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch
- + "%s=n/' config/common_base" % self.compile_switch, "# ", 30)
- self.dut.skip_setup = False
- self.dut.build_install_dpdk(self.target)
+ if self.dut.build_type != "meson":
+ out = self.dut.send_expect("cat config/common_base", "]# ", 10)
+ src_vec_model = re.search("%s=." % self.compile_switch, out).group()[-1]
+ if src_vec_model == 'y':
+ self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch
+ + "%s=n/' config/common_base" % self.compile_switch, "# ", 30)
+ self.dut.skip_setup = False
+ self.dut.build_install_dpdk(self.target)
pmd_temp = "./%(TARGET)s -c %(COREMASK)s -n " + \
"%(CHANNEL)d -- -i --disable-rss --rxq=4 --txq=4" + \
@@ -570,13 +576,14 @@ class TestVxlan(TestCase, IxiaPacketGenerator):
print("CVL support default none VECTOR")
src_vec_model = 'n'
else:
- out = self.dut.send_expect("cat config/common_base", "]# ", 10)
- dst_vec_model = re.findall("%s=." % self.compile_switch, out)[0][-1]
- if src_vec_model != dst_vec_model:
- self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch
- + "%s=%s/' config/common_base" % (self.compile_switch, src_vec_model), "# ", 30)
- self.dut.skip_setup = False
- self.dut.build_install_dpdk(self.target)
+ if self.dut.build_type != "meson":
+ out = self.dut.send_expect("cat config/common_base", "]# ", 10)
+ dst_vec_model = re.findall("%s=." % self.compile_switch, out)[0][-1]
+ if src_vec_model != dst_vec_model:
+ self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch
+ + "%s=%s/' config/common_base" % (self.compile_switch, src_vec_model), "# ", 30)
+ self.dut.skip_setup = False
+ self.dut.build_install_dpdk(self.target)
def test_vxlan_ipv6_detect(self):
"""
@@ -586,13 +593,14 @@ class TestVxlan(TestCase, IxiaPacketGenerator):
print("CVL support default none VECTOR")
src_vec_model = 'n'
else:
- out = self.dut.send_expect("cat config/common_base", "]# ", 10)
- src_vec_model = re.search("%s=." % self.compile_switch, out).group()[-1]
- if src_vec_model == 'y':
- self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch
- + "%s=n/' config/common_base" % self.compile_switch, "# ", 30)
- self.dut.skip_setup = False
- self.dut.build_install_dpdk(self.target)
+ if self.dut.build_type != "meson":
+ out = self.dut.send_expect("cat config/common_base", "]# ", 10)
+ src_vec_model = re.search("%s=." % self.compile_switch, out).group()[-1]
+ if src_vec_model == 'y':
+ self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch
+ + "%s=n/' config/common_base" % self.compile_switch, "# ", 30)
+ self.dut.skip_setup = False
+ self.dut.build_install_dpdk(self.target)
pmd_temp = "./%(TARGET)s -c %(COREMASK)s -n " + \
"%(CHANNEL)d -- -i --disable-rss --rxq=4 --txq=4" + \
@@ -632,13 +640,14 @@ class TestVxlan(TestCase, IxiaPacketGenerator):
print("CVL support default none VECTOR")
src_vec_model = 'n'
else:
- out = self.dut.send_expect("cat config/common_base", "]# ", 10)
- dst_vec_model = re.findall("%s=." % self.compile_switch, out)[0][-1]
- if src_vec_model != dst_vec_model:
- self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch
- + "%s=%s/' config/common_base" % (self.compile_switch, src_vec_model), "# ", 30)
- self.dut.skip_setup = False
- self.dut.build_install_dpdk(self.target)
+ if self.dut.build_type != "meson":
+ out = self.dut.send_expect("cat config/common_base", "]# ", 10)
+ dst_vec_model = re.findall("%s=." % self.compile_switch, out)[0][-1]
+ if src_vec_model != dst_vec_model:
+ self.dut.send_expect("sed -i -e 's/%s=.*$/" % self.compile_switch
+ + "%s=%s/' config/common_base" % (self.compile_switch, src_vec_model), "# ", 30)
+ self.dut.skip_setup = False
+ self.dut.build_install_dpdk(self.target)
def test_vxlan_ipv4_checksum_offload(self):
"""
--
1.8.3.1
next reply other threads:[~2020-09-24 9:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-24 9:34 xizhan4x [this message]
2020-09-24 9:35 ` Zhang, XiX
2020-09-29 8:33 ` Ma, LihongX
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=1600940050-3782-1-git-send-email-xix.zhang@intel.com \
--to=xix.zhang@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).