From: Ling Wei <weix.ling@intel.com>
To: dts@dpdk.org
Cc: Ling Wei <weix.ling@intel.com>
Subject: [dts] [PATCH V1 6/9] tests/vhost_virtio_user_interrupt:modify hard code bind cbdma device to igb_uio by drivername in execution.cfg
Date: Fri, 19 Mar 2021 14:46:50 +0800 [thread overview]
Message-ID: <20210319064650.4712-1-weix.ling@intel.com> (raw)
1.Modify hard code bind cbdma device to igb_uio by drivername
in execution.cfg.
2.Adjust code format.
Signed-off-by: Ling Wei <weix.ling@intel.com>
---
tests/TestSuite_vhost_virtio_user_interrupt.py | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/tests/TestSuite_vhost_virtio_user_interrupt.py b/tests/TestSuite_vhost_virtio_user_interrupt.py
index 29693f43..04c86769 100644
--- a/tests/TestSuite_vhost_virtio_user_interrupt.py
+++ b/tests/TestSuite_vhost_virtio_user_interrupt.py
@@ -62,7 +62,6 @@ class TestVirtioUserInterrupt(TestCase):
self.cbdma_dev_infos = []
self.dmas_info = None
self.device_str = None
-
self.prepare_l3fwd_power()
self.tx_port = self.tester.get_local_port(self.dut_ports[0])
self.tx_interface = self.tester.get_interface(self.tx_port)
@@ -78,7 +77,6 @@ class TestVirtioUserInterrupt(TestCase):
self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#")
self.dut.send_expect("killall %s" % self.l3fwdpower_name, "#")
self.dut.send_expect("rm -rf vhost-net*", "#")
-
self.l3fwd = self.dut.new_session(suite="l3fwd")
self.vhost = self.dut.new_session(suite="vhost")
self.virtio = self.dut.new_session(suite="virito")
@@ -145,7 +143,6 @@ class TestVirtioUserInterrupt(TestCase):
else:
eal_params = self.dut.create_eal_parameters(cores=self.core_list_vhost, prefix='vhost', no_pci=True, vdevs=vdev)
cmd_vhost_user = testcmd + eal_params + para
-
self.vhost.send_expect(cmd_vhost_user, "testpmd>", 30)
self.vhost.send_expect("set fwd mac", "testpmd>", 30)
self.vhost.send_expect("start", "testpmd>", 30)
@@ -186,6 +183,9 @@ class TestVirtioUserInterrupt(TestCase):
"""
get all cbdma ports
"""
+ # check driver name in execution.cfg
+ self.verify(self.drivername == 'igb_uio',
+ "CBDMA test case only use igb_uio driver, need config drivername=igb_uio in execution.cfg")
str_info = 'Misc (rawdev) devices using kernel driver'
out = self.dut.send_expect('./usertools/dpdk-devbind.py --status-dev misc', '# ', 30)
device_info = out.split('\n')
@@ -211,9 +211,7 @@ class TestVirtioUserInterrupt(TestCase):
dmas_info += dmas
self.dmas_info = dmas_info[:-1]
self.device_str = ' '.join(self.used_cbdma)
- self.dut.setup_modules(self.target, "igb_uio", "None")
- self.dut.send_expect('./usertools/dpdk-devbind.py --force --bind=%s %s %s' %
- ("igb_uio", self.device_str, self.pci_info), '# ', 60)
+ self.dut.send_expect('./usertools/dpdk-devbind.py --force --bind=%s %s' % (self.drivername, self.device_str), '# ', 60)
def bind_cbdma_device_to_kernel(self):
if self.device_str is not None:
@@ -309,7 +307,6 @@ class TestVirtioUserInterrupt(TestCase):
self.start_vhost_testpmd(pci="--no-pci")
self.start_virtio_user(packed=True)
self.check_virtio_side_link_status("up")
-
self.vhost.send_expect("quit", "#", 20)
self.check_virtio_side_link_status("down")
@@ -321,7 +318,6 @@ class TestVirtioUserInterrupt(TestCase):
self.start_vhost_testpmd(pci=self.used_cbdma, dmas=self.dmas_info)
self.start_virtio_user()
self.check_virtio_side_link_status("up")
-
self.vhost.send_expect("quit", "#", 20)
self.check_virtio_side_link_status("down")
self.dut.send_expect("killall %s" % self.l3fwdpower_name, "#")
--
2.25.1
reply other threads:[~2021-03-19 6:47 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20210319064650.4712-1-weix.ling@intel.com \
--to=weix.ling@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).