[V1,4/4] tests: remove unnecessary common_base modification and build

Message ID 20200818075255.19830-4-xinfengx.zhao@intel.com (mailing list archive)
State Accepted
Headers
Series [V1,1/4] conf: modify cryptodev virtio perf test plan |

Commit Message

Zhao, XinfengX Aug. 18, 2020, 7:52 a.m. UTC
  Signed-off-by: xinfeng zhao <xinfengx.zhao@intel.com>
---
 tests/TestSuite_virtio_unit_cryptodev_func.py | 19 -------------------
 1 file changed, 19 deletions(-)
  

Comments

Zhao, XinfengX Aug. 18, 2020, 7:59 a.m. UTC | #1
Tested-by:  Zhao, Xinfeng<xinfengx.zhao@intel.com>

-----Original Message-----
From: Zhao, XinfengX 
Sent: Tuesday, August 18, 2020 3:53 PM
To: dts@dpdk.org
Cc: Zhao, XinfengX <xinfengx.zhao@intel.com>
Subject: [dts][PATCH V1 4/4] tests: remove unnecessary common_base modification and build

Signed-off-by: xinfeng zhao <xinfengx.zhao@intel.com>
---
 tests/TestSuite_virtio_unit_cryptodev_func.py | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/tests/TestSuite_virtio_unit_cryptodev_func.py b/tests/TestSuite_virtio_unit_cryptodev_func.py
index 47e9c47..d8f56e2 100644
--- a/tests/TestSuite_virtio_unit_cryptodev_func.py
+++ b/tests/TestSuite_virtio_unit_cryptodev_func.py
@@ -86,15 +86,6 @@ class VirtioCryptodevUnitTest(TestCase):
     def dut_execut_cmd(self, cmdline, ex='#', timout=30):
         return self.dut.send_expect(cmdline, ex, timout)
 
-    def build_user_dpdk(self, user_dut):
-        user_dut.send_expect(
-            "sed -i 's/CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n$/CONFIG_RTE_LIBRTE_PMD_AESNI_MB=y/' config/common_base", '#', 30)
-        user_dut.send_expect(
-            "sed -i 's/CONFIG_RTE_EAL_IGB_UIO=n/CONFIG_RTE_EAL_IGB_UIO=y/g' config/common_base", '#', 30)
-        out = user_dut.send_expect("make -j %d install T=%s MAKE_PAUSE=n" % (user_dut.number_of_cores, self.target), "# ", 900)
-        self.verify("Error" not in out, "compilation error 1")
-        self.verify("No such file" not in out, "compilation error 2")
-
     def build_vhost_app(self):
         out = self.dut_execut_cmd("make -C ./examples/vhost_crypto")
 
@@ -155,24 +146,14 @@ class VirtioCryptodevUnitTest(TestCase):
         vm = QEMUKvm(self.dut, vm_name, 'virtio_unit_cryptodev_func')
         vf0 = {'opt_host': self.sriov_vfs_port[0].pci}
         vm.set_vm_device(driver=self.vf_assign_method, **vf0)
-        skip_setup = self.dut.skip_setup
 
         try:
-            self.dut.skip_setup = True
             vm_dut = vm.start()
             if vm_dut is None:
                 print(('{} start failed'.format(vm_name)))
         except Exception as err:
             raise err
 
-        self.dut.skip_setup = skip_setup
-        vm_dut.restore_interfaces()
-
-        if not self.dut.skip_setup:
-            self.build_user_dpdk(vm_dut)
-
-        vm_dut.setup_modules(self.target, "igb_uio", None)
-        vm_dut.bind_interfaces_linux('igb_uio')
         vm.virtio_list = self.set_virtio_pci(vm_dut)
         self.logger.info("{} virtio list: {}".format(vm_name, vm.virtio_list))
         vm.cores = vm_dut.get_core_list("all")
  

Patch

diff --git a/tests/TestSuite_virtio_unit_cryptodev_func.py b/tests/TestSuite_virtio_unit_cryptodev_func.py
index 47e9c47..d8f56e2 100644
--- a/tests/TestSuite_virtio_unit_cryptodev_func.py
+++ b/tests/TestSuite_virtio_unit_cryptodev_func.py
@@ -86,15 +86,6 @@  class VirtioCryptodevUnitTest(TestCase):
     def dut_execut_cmd(self, cmdline, ex='#', timout=30):
         return self.dut.send_expect(cmdline, ex, timout)
 
-    def build_user_dpdk(self, user_dut):
-        user_dut.send_expect(
-            "sed -i 's/CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n$/CONFIG_RTE_LIBRTE_PMD_AESNI_MB=y/' config/common_base", '#', 30)
-        user_dut.send_expect(
-            "sed -i 's/CONFIG_RTE_EAL_IGB_UIO=n/CONFIG_RTE_EAL_IGB_UIO=y/g' config/common_base", '#', 30)
-        out = user_dut.send_expect("make -j %d install T=%s MAKE_PAUSE=n" % (user_dut.number_of_cores, self.target), "# ", 900)
-        self.verify("Error" not in out, "compilation error 1")
-        self.verify("No such file" not in out, "compilation error 2")
-
     def build_vhost_app(self):
         out = self.dut_execut_cmd("make -C ./examples/vhost_crypto")
 
@@ -155,24 +146,14 @@  class VirtioCryptodevUnitTest(TestCase):
         vm = QEMUKvm(self.dut, vm_name, 'virtio_unit_cryptodev_func')
         vf0 = {'opt_host': self.sriov_vfs_port[0].pci}
         vm.set_vm_device(driver=self.vf_assign_method, **vf0)
-        skip_setup = self.dut.skip_setup
 
         try:
-            self.dut.skip_setup = True
             vm_dut = vm.start()
             if vm_dut is None:
                 print(('{} start failed'.format(vm_name)))
         except Exception as err:
             raise err
 
-        self.dut.skip_setup = skip_setup
-        vm_dut.restore_interfaces()
-
-        if not self.dut.skip_setup:
-            self.build_user_dpdk(vm_dut)
-
-        vm_dut.setup_modules(self.target, "igb_uio", None)
-        vm_dut.bind_interfaces_linux('igb_uio')
         vm.virtio_list = self.set_virtio_pci(vm_dut)
         self.logger.info("{} virtio list: {}".format(vm_name, vm.virtio_list))
         vm.cores = vm_dut.get_core_list("all")