test suite reviews and discussions
 help / color / mirror / Atom feed
* [dts] [PATCH V1 1/4] executions/execution*: removed makefile from configure file
@ 2021-11-17  8:54 DongJunX
  2021-11-17  8:54 ` [dts] [PATCH V1 2/4] doc/dts_gsg: removed makefile from user guide document DongJunX
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: DongJunX @ 2021-11-17  8:54 UTC (permalink / raw)
  To: qinx.sun, weix.ling, yanx.xia, yux.jiang, zhiminx.huang,
	hailinx.xu, songx.jiale
  Cc: dts

Signed-off-by: DongJunX <junx.dong@intel.com>
---
 conf/app_name.cfg               | 62 ++-------------------------------
 executions/execution.cfg        |  2 +-
 executions/execution_FVL.cfg    |  2 +-
 executions/execution_fm10k.cfg  |  2 +-
 executions/execution_rxmode.cfg |  4 +--
 executions/execution_smoke.cfg  |  2 +-
 6 files changed, 8 insertions(+), 66 deletions(-)

diff --git a/conf/app_name.cfg b/conf/app_name.cfg
index 985ee115..e6749435 100644
--- a/conf/app_name.cfg
+++ b/conf/app_name.cfg
@@ -1,5 +1,5 @@
 # app path configuration
-# [meson/makefile] : the build type
+# [meson] : the build type
 # app_name=app_path #about the app_path, you can use 'target' instead of build target in the path
 # eg: if the testpmd app_path is: x86_64-native-linuxapp-gcc/app/testpmd,
 #     you can use string 'target' instead of 'x86_64-native-linuxapp-gcc'
@@ -69,62 +69,4 @@ node=target/examples/dpdk-efd_node
 server=target/examples/dpdk-efd_server
 testpmd_vf=target/app/dpdk-testpmd-vf
 vm_power_manager=target/examples/dpdk-vm_power_manager
-guest_cli=target/examples/dpdk-guest_cli
-[makefile]
-pdump=target/app/dpdk-pdump
-proc-info=target/app/dpdk-procinfo
-test=target/app/test
-test-acl=target/app/testacl
-test-bbdev=target/app/testbbdev
-test-cmdline=target/app/cmdline_test
-test-compress-perf=target/app/dpdk-test-compress-perf
-test-crypto-perf=target/app/dpdk-test-crypto-perf
-test-eventdev=target/app/dpdk-test-eventdev
-test-pipeline=target/app/testpipeline
-test-pmd=target/app/testpmd
-test-sad=target/app/testsad
-ethtool=examples/ethtool/ethtool-app/ethtool
-eventdev_pipeline=examples/eventdev_pipeline/build/app/eventdev_pipeline
-fips_validation=examples/fips_validation/build/app/fips_validation
-flow_classify=examples/flow_classify/build/app/flow_classify
-flow_filtering=examples/flow_filtering/build/app/flow
-helloworld=examples/helloworld/build/app/helloworld
-ioat=examples/ioat/build/app/ioatfwd
-ip_fragmentation=examples/ip_fragmentation/build/app/ip_fragmentation
-ip_pipeline=examples/ip_pipeline/build/app/ip_pipeline
-ip_reassembly=examples/ip_reassembly/build/app/ip_reassembly
-ipsec-secgw=examples/ipsec-secgw/build/app/ipsec-secgw
-ipv4_multicast=examples/ipv4_multicast/build/app/ipv4_multicast
-kni=examples/kni/build/app/kni
-l2fwd=examples/l2fwd/build/app/l2fwd
-l2fwd-crypto=examples/l2fwd-crypto/build/app/l2fwd-crypto
-l2fwd-event=examples/l2fwd-event/build/app/l2fwd-event
-l2fwd-jobstats=examples/l2fwd-jobstats/build/app/l2fwd-jobstats
-l2fwd-keepalive=examples/l2fwd-keepalive/build/app/l2fwd-keepalive
-l3fwd=examples/l3fwd/build/app/l3fwd
-l3fwd-acl=examples/l3fwd-acl/build/app/l3fwd-acl
-l3fwd-power=examples/l3fwd-power/build/app/l3fwd-power
-l3fwd-thread=examples/performance-thread/l3fwd-thread/build/app/l3fwd-thread
-link_status_interrupt=examples/link_status_interrupt/build/app/link_status_interrupt
-ntb=examples/ntb/build/app/ntb_fwd
-packet_ordering=examples/packet_ordering/build/app/packet_ordering
-pipeline=examples/pipeline/build/app/pipeline
-ptpclient=examples/ptpclient/build/app/ptpclient
-qos_meter=examples/qos_meter/build/app/qos_meter
-qos_sched=examples/qos_sched/build/app/qos_sched
-rxtx_callbacks=examples/rxtx_callbacks/build/app/rxtx_callbacks
-service_cores=examples/service_cores/build/app/service_cores
-skeleton=examples/skeleto/build/app/basicfwd
-tep_termination=examples/tep_termination/build/app/tep_termination
-timer=examples/timer/build/app/timer
-vdpa=examples/vdpa/build/app/vdpa
-vhost=examples/vhost/build/app/vhost-switch
-vhost_blk=examples/vhost_blk/build/app/vhost-blk
-vhost_crypto=examples/vhost_crypto/build/app/vhost-crypto
-vmdq=examples/vmdq/build/app/vmdq_app
-vmdq_dcb=examples/vmdq_dcb/build/app/vmdq_dcb_app
-mp_client=examples/multi_process/client_server_mp/mp_client/build/app/mp_client
-hotplug_mp=examples/multi_process/hotplug_mp/build/app/hotplug_mp
-mp_server=examples/multi_process/client_server_mp/mp_server/build/app/mp_server
-simple_mp=examples/multi_process/simple_mp/build/app/simple_mp
-symmetric_mp=examples/multi_process/symmetric_mp/build/app/symmetric_mp
+guest_cli=target/examples/dpdk-guest_cli
\ No newline at end of file
diff --git a/executions/execution.cfg b/executions/execution.cfg
index f572074f..658b1ad4 100644
--- a/executions/execution.cfg
+++ b/executions/execution.cfg
@@ -2,7 +2,7 @@
 crbs=<CRB IP Address>
 #using igb_uio please refer to doc/dts_gsg/support_igb_uio.rst
 drivername=<driver name igb_uio or vfio-pci or mlx5_core or uio_pci_generic>
-build_type=<makefile or meson>
+build_type=<meson>
 test_suites=
     cmdline,
     hello_world,
diff --git a/executions/execution_FVL.cfg b/executions/execution_FVL.cfg
index b1cc02d1..d32d4d4a 100644
--- a/executions/execution_FVL.cfg
+++ b/executions/execution_FVL.cfg
@@ -2,7 +2,7 @@
 crbs=<CRB IP Address>
 #using igb_uio please refer to doc/dts_gsg/support_igb_uio.rst
 drivername=<driver name igb_uio or vfio-pci or mlx5_core or uio_pci_generic>
-build_type=<makefile or meson>
+build_type=<meson>
 test_suites=
     checksum_offload,
     dynamic_config,
diff --git a/executions/execution_fm10k.cfg b/executions/execution_fm10k.cfg
index 414e7131..57c25f96 100644
--- a/executions/execution_fm10k.cfg
+++ b/executions/execution_fm10k.cfg
@@ -2,7 +2,7 @@
 crbs=<CRB IP Address>
 #using igb_uio please refer to doc/dts_gsg/support_igb_uio.rst
 drivername=<driver name igb_uio or vfio-pci or uio_pci_generic>
-build_type=<makefile or meson>
+build_type=<meson>
 test_suites=
     checksum_offload,
     vlan,
diff --git a/executions/execution_rxmode.cfg b/executions/execution_rxmode.cfg
index d8feb535..5cd0e6d4 100644
--- a/executions/execution_rxmode.cfg
+++ b/executions/execution_rxmode.cfg
@@ -3,7 +3,7 @@ crbs=<CRB IP Address>
 #using igb_uio please refer to doc/dts_gsg/support_igb_uio.rst
 drivername=igb_uio
 rx_mode=scalar
-build_type=<makefile or meson>
+build_type=<meson>
 test_suites=
     fdir,
     jumboframes,
@@ -47,7 +47,7 @@ parameters=nic_type=cfg:func=true
 crbs=<CRB IP Address>
 drivername=igb_uio
 rx_mode=vector
-build_type=<makefile or meson>
+build_type=<meson>
 test_suites=
     fdir,
     jumboframes,
diff --git a/executions/execution_smoke.cfg b/executions/execution_smoke.cfg
index 1568d40e..6f35578d 100644
--- a/executions/execution_smoke.cfg
+++ b/executions/execution_smoke.cfg
@@ -2,7 +2,7 @@
 crbs=<CRB IP Address>
 #using igb_uio please refer to doc/dts_gsg/support_igb_uio.rst
 drivername=<driver name igb_uio or vfio-pci or mlx5_core or uio_pci_generic>
-build_type=<makefile or meson>
+build_type=<meson>
 test_suites=
     unit_tests_cmdline,
     unit_tests_eal,
-- 
2.33.1.windows.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [dts] [PATCH V1 2/4] doc/dts_gsg: removed makefile from user guide document
  2021-11-17  8:54 [dts] [PATCH V1 1/4] executions/execution*: removed makefile from configure file DongJunX
@ 2021-11-17  8:54 ` DongJunX
  2021-11-17  8:54 ` [dts] [PATCH V1 3/4] framework/*: removed makefile from framework DongJunX
  2021-11-17  8:54 ` [dts] [PATCH V1 4/4] tests/*: removed makefile from test suite DongJunX
  2 siblings, 0 replies; 5+ messages in thread
From: DongJunX @ 2021-11-17  8:54 UTC (permalink / raw)
  To: qinx.sun, weix.ling, yanx.xia, yux.jiang, zhiminx.huang,
	hailinx.xu, songx.jiale
  Cc: dts

Signed-off-by: DongJunX <junx.dong@intel.com>
---
 doc/dts_gsg/usr_guide/usage.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/dts_gsg/usr_guide/usage.rst b/doc/dts_gsg/usr_guide/usage.rst
index ef729a9e..7f0b5e0f 100644
--- a/doc/dts_gsg/usr_guide/usage.rst
+++ b/doc/dts_gsg/usr_guide/usage.rst
@@ -24,7 +24,7 @@ First of all, you must configure execution.cfg as below:
 
 * crbs: IP address of the DUT. The detail information is defined in file conf/crbs.cfg.
 * drivername: the driver devices used by DPDK bound to.
-* build_type: the tool for building DPDK, it can be meson and makefile. DPDK 20.11+ only uses meson and ninja.
+* build_type: the tool for building DPDK, it can be meson.
 * rx_mode: vector instructions used in tests, it can be novector/sse/avx2/avx512. it is optional, if not set, dpdk uses avx2 by default.
 * test_suites: test suites and cases that to be executed. use ``:`` to separate suite and it's cases and use ``\`` to separate different cases.
 * targets: DPDK targets to be tested.
-- 
2.33.1.windows.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [dts] [PATCH V1 3/4] framework/*: removed makefile from framework
  2021-11-17  8:54 [dts] [PATCH V1 1/4] executions/execution*: removed makefile from configure file DongJunX
  2021-11-17  8:54 ` [dts] [PATCH V1 2/4] doc/dts_gsg: removed makefile from user guide document DongJunX
@ 2021-11-17  8:54 ` DongJunX
  2021-11-17  8:54 ` [dts] [PATCH V1 4/4] tests/*: removed makefile from test suite DongJunX
  2 siblings, 0 replies; 5+ messages in thread
From: DongJunX @ 2021-11-17  8:54 UTC (permalink / raw)
  To: qinx.sun, weix.ling, yanx.xia, yux.jiang, zhiminx.huang,
	hailinx.xu, songx.jiale
  Cc: dts

Signed-off-by: DongJunX <junx.dong@intel.com>
---
 framework/dts.py          |   8 ---
 framework/dut.py          |   4 +-
 framework/project_dpdk.py | 147 +++-----------------------------------
 framework/settings.py     |   1 -
 framework/virt_dut.py     |   7 +-
 5 files changed, 13 insertions(+), 154 deletions(-)

diff --git a/framework/dts.py b/framework/dts.py
index 892aa1fc..18a3d79c 100644
--- a/framework/dts.py
+++ b/framework/dts.py
@@ -94,14 +94,6 @@ def dts_parse_param(config, section):
 
     parameters = config.get(section, 'parameters').split(':')
     drivername = config.get(section, 'drivername').split('=')[-1]
-    # get the build method, default is makefile
-    try:
-        buildtype = config.get(section, 'build_type').split('=')[-1]
-    except:
-        buildtype = 'meson'
-    buildtype = buildtype.lower()
-    settings.save_global_setting(settings.HOST_BUILD_TYPE_SETTING, buildtype)
-
     driver = drivername.split(':')
     if len(driver) == 2:
         drivername = driver[0]
diff --git a/framework/dut.py b/framework/dut.py
index dc3fc874..2c0d0b68 100644
--- a/framework/dut.py
+++ b/framework/dut.py
@@ -237,9 +237,7 @@ class Dut(Crb):
         if use_shared_lib == 'true' and shared_lib_path and 'Virt' not in str(self):
             eal_str = eal_str + ' -d {} '.format(shared_lib_path)
         rx_mode = settings.load_global_setting(settings.DPDK_RXMODE_SETTING)
-        build_type = settings.load_global_setting(settings.HOST_BUILD_TYPE_SETTING)
-        if build_type == 'meson' and ('other_eal_param' not in config or
-                                      'force-max-simd-bitwidth' not in config['other_eal_param']):
+        if 'other_eal_param' not in config or 'force-max-simd-bitwidth' not in config['other_eal_param']:
             if rx_mode == 'novector':
                 eal_str = eal_str + ' --force-max-simd-bitwidth=64 '
             elif rx_mode == 'sse':
diff --git a/framework/project_dpdk.py b/framework/project_dpdk.py
index 9927bcc1..9ff5b9c9 100644
--- a/framework/project_dpdk.py
+++ b/framework/project_dpdk.py
@@ -38,7 +38,6 @@ from .logger import getLogger
 from .settings import (
     DPDK_RXMODE_SETTING,
     DRIVERS,
-    HOST_BUILD_TYPE_SETTING,
     HOST_DRIVER_MODE_SETTING,
     HOST_DRIVER_SETTING,
     HOST_SHARED_LIB_PATH,
@@ -71,10 +70,6 @@ class DPDKdut(Dut):
         Set hugepage on DUT and install modules required by DPDK.
         Configure default ixgbe PMD function.
         """
-        # get apps name of current build type
-        self.build_type = load_global_setting(HOST_BUILD_TYPE_SETTING)
-        if self.build_type not in self.apps_name_conf:
-            raise Exception('please config the apps name in app_name.cfg of build type:%s' % self.build_type)
         self.target = target
 
         self.set_toolchain(target)
@@ -88,7 +83,7 @@ class DPDKdut(Dut):
 
         self.set_driver_specific_configurations(drivername)
 
-        self.apps_name = self.apps_name_conf[self.build_type]
+        self.apps_name = self.apps_name_conf['meson']
         # use the dut target directory instead of 'target' string in app name
         for app in self.apps_name:
             cur_app_path = self.apps_name[app].replace('target', self.target)
@@ -197,61 +192,24 @@ class DPDKdut(Dut):
         """
         Set default RX/TX PMD function,
         the rx mode scalar/full/novector are supported dynamically since DPDK 20.11,
-        The DPDK version should be <=20.08 when compiling DPDK by makefile to use these rx modes,
         Rx mode avx512 is only supported in DPDK 20.11 and later version.
         """
-
         mode = load_global_setting(DPDK_RXMODE_SETTING)
-        build_type = load_global_setting(HOST_BUILD_TYPE_SETTING)
-        if build_type == 'makefile':
-            if mode == 'scalar':
-                self.set_build_options({'RTE_LIBRTE_I40E_INC_VECTOR': 'n',
-                                        'RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC': 'y'})
-            elif mode == 'full':
-                self.set_build_options({'RTE_LIBRTE_I40E_INC_VECTOR': 'n',
-                                        'RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC': 'n'})
-            elif mode == 'novector':
-                self.set_build_options({'RTE_IXGBE_INC_VECTOR': 'n',
-                                        'RTE_LIBRTE_I40E_INC_VECTOR': 'n'})
-            elif mode == 'avx512':
-                self.logger.warning(RED('*********AVX512 is not supported by makefile!!!********'))
-        else:
-            if mode == 'avx512':
-                out = self.send_expect('lscpu | grep avx512', '#')
-                if 'avx512f' not in out or 'no-avx512f' in out:
-                    self.logger.warning(RED('*********The DUT CPU do not support AVX512 test!!!********'))
-                    self.logger.warning(RED('*********Now set the rx_mode to default!!!**********'))
-                    save_global_setting(DPDK_RXMODE_SETTING, 'default')
+        if mode == 'avx512':
+            out = self.send_expect('lscpu | grep avx512', '#')
+            if 'avx512f' not in out or 'no-avx512f' in out:
+                self.logger.warning(RED('*********The DUT CPU do not support AVX512 test!!!********'))
+                self.logger.warning(RED('*********Now set the rx_mode to default!!!**********'))
+                save_global_setting(DPDK_RXMODE_SETTING, 'default')
 
     def set_package(self, pkg_name="", patch_list=[]):
         self.package = pkg_name
         self.patches = patch_list
 
     def set_build_options(self, config_parms, config_file=''):
-        build_type = load_global_setting(HOST_BUILD_TYPE_SETTING)
-        set_build_options = getattr(self, 'set_build_options_%s' % (build_type))
+        set_build_options = getattr(self, 'set_build_options_meson')
         set_build_options(config_parms, config_file)
 
-    def set_build_options_makefile(self, config_parms, config_file=''):
-        """
-        Set dpdk build options of makefile
-        """
-        if len(config_parms) == 0:
-            return;
-        if config_file == '':
-            config_file = 'config/common_base'
-
-        for key in config_parms.keys():
-            value = config_parms[key]
-            if isinstance(value, int):
-                self.send_expect("sed -i -e 's/CONFIG_%s=.*$/CONFIG_%s=%d/' %s" % (key, key, value, config_file), "# ")
-            else:
-                if value == '':
-                    value = 'y'
-                elif len(value) > 1:
-                    value = '\\"%s\\"' % value
-            self.send_expect("sed -i -e 's/CONFIG_%s=.*$/CONFIG_%s=%s/' %s" % (key, key, value, config_file), "# ")
-
     def set_build_options_meson(self, config_parms, config_file=''):
         """
         Set dpdk build options of meson
@@ -296,8 +254,7 @@ class DPDKdut(Dut):
             kernel_driver = self.nic.default_driver
             nic_name = self.nic.name
 
-        build_type = load_global_setting(HOST_BUILD_TYPE_SETTING)
-        build_install_dpdk = getattr(self, 'build_install_dpdk_%s_%s' % (self.get_os_type(), build_type))
+        build_install_dpdk = getattr(self, 'build_install_dpdk_%s_meson' % self.get_os_type())
         build_install_dpdk(target, extra_options)
 
     def build_install_dpdk_linux_meson(self, target, extra_options):
@@ -347,32 +304,6 @@ class DPDKdut(Dut):
             for mod in kmod:
                 self.send_expect("cp %s %s/kmod/" % (mod, target), "# ")
 
-    def build_install_dpdk_linux_makefile(self, target, extra_options):
-        """
-        Build DPDK source code on linux with specified target.
-        """
-        build_time = 600
-        if "icc" in target:
-            build_time = 900
-        # clean all
-        self.send_expect("rm -rf " + target, "#")
-        self.send_expect("rm -rf %s" % r'./app/test/test_resource_c.res.o' , "#")
-        self.send_expect("rm -rf %s" % r'./app/test/test_resource_tar.res.o' , "#")
-        self.send_expect("rm -rf %s" % r'./app/test/test_pci_sysfs.res.o' , "#")
-
-        self.set_build_options({'RTE_EAL_IGB_UIO': 'y'})
-
-        # compile
-        out = self.send_expect("make -j %d install T=%s %s MAKE_PAUSE=n" %
-            (self.number_of_cores, target, extra_options), "# ", build_time)
-        if("Error" in out or "No rule to make" in out):
-            self.logger.error("ERROR - try without '-j'")
-            # if Error try to execute make without -j option
-            out = self.send_expect("make install T=%s %s MAKE_PAUSE=n" % (target, extra_options), "# ", build_time*4)
-
-        assert ("Error" not in out), "Compilation error..."
-        assert ("No rule to make" not in out), "No rule to make error..."
-
     def build_install_dpdk_freebsd_meson(self, target, extra_options):
         # meson build same as linux
         self.build_install_dpdk_linux_meson(target, extra_options)
@@ -383,29 +314,6 @@ class DPDKdut(Dut):
         if not isinstance(out, int) and len(out) > 0:
             self.send_expect("cp %s %s/kmod/" % (out, target), "# ")
 
-    def build_install_dpdk_freebsd_makefile(self, target, extra_options):
-        """
-        Build DPDK source code on Freebsd with specified target.
-        """
-        # clean all
-        self.send_expect("rm -rf " + target, "#")
-        self.send_expect("rm -rf %s" % r'./app/test/test_resource_c.res.o' , "#")
-        self.send_expect("rm -rf %s" % r'./app/test/test_resource_tar.res.o' , "#")
-        self.send_expect("rm -rf %s" % r'./app/test/test_pci_sysfs.res.o' , "#")
-        build_time = 180
-        # compile
-        out = self.send_expect("make -j %d install T=%s MAKE_PAUSE=n" % (self.number_of_cores,
-                                                                     target),
-                               "#", build_time)
-        if("Error" in out or "No rule to make" in out):
-            self.logger.error("ERROR - try without '-j'")
-            # if Error try to execute make without -j option
-            out = self.send_expect("make install T=%s MAKE_PAUSE=n" % target,
-                                   "#", build_time)
-
-        assert ("Error" not in out), "Compilation error..."
-        assert ("No rule to make" not in out), "No rule to make error..."
-
     def prepare_package(self):
         if not self.skip_setup:
             session_info = None
@@ -536,8 +444,7 @@ class DPDKdut(Dut):
         """
         Build dpdk sample applications.
         """
-        build_type = load_global_setting(HOST_BUILD_TYPE_SETTING)
-        build_dpdk_apps = getattr(self, 'build_dpdk_apps_%s_%s' % (self.get_os_type(), build_type))
+        build_dpdk_apps = getattr(self, 'build_dpdk_apps_%s_meson' % self.get_os_type())
         return build_dpdk_apps(folder, extra_options)
 
     def build_dpdk_apps_linux_meson(self, folder, extra_options):
@@ -589,37 +496,10 @@ class DPDKdut(Dut):
 
         return out
 
-    def build_dpdk_apps_linux_makefile(self, folder, extra_options):
-        """
-        Build dpdk sample applications on linux.
-        """
-        # icc compile need more time
-        if 'icc' in self.target:
-            timeout = 300
-        else:
-            timeout = 90
-        self.send_expect("rm -rf %s" % r'./app/test/test_resource_c.res.o' , "#")
-        self.send_expect("rm -rf %s" % r'./app/test/test_resource_tar.res.o' , "#")
-        self.send_expect("rm -rf %s" % r'./app/test/test_pci_sysfs.res.o' , "#")
-        return self.send_expect("make -j %d -C %s %s" % (self.number_of_cores,
-                                                         folder, extra_options),
-                                "# ", timeout)
-
     def build_dpdk_apps_freebsd_meson(self, folder, extra_options):
         # meson build same as linux
         return self.build_dpdk_apps_linux_meson(folder, extra_options)
 
-    def build_dpdk_apps_freebsd_makefile(self, folder, extra_options):
-        """
-        Build dpdk sample applications on Freebsd.
-        """
-        self.send_expect("rm -rf %s" % r'./app/test/test_resource_c.res.o' , "#")
-        self.send_expect("rm -rf %s" % r'./app/test/test_resource_tar.res.o' , "#")
-        self.send_expect("rm -rf %s" % r'./app/test/test_pci_sysfs.res.o' , "#")
-        return self.send_expect("make -j %d -C %s %s" % (self.number_of_cores,
-                                                                  folder, extra_options),
-                                "# ", 180)
-
     def get_blocklist_string(self, target, nic):
         """
         Get block list command string.
@@ -668,12 +548,7 @@ class DPDKdut(Dut):
         """
         # Enable Mellanox drivers
         if drivername == "mlx5_core" or drivername == "mlx4_core":
-            self.send_expect("sed -i -e 's/CONFIG_RTE_LIBRTE_MLX5_PMD=n/"
-                             + "CONFIG_RTE_LIBRTE_MLX5_PMD=y/' config/common_base", "# ", 30)
-            self.send_expect("sed -i -e 's/CONFIG_RTE_LIBRTE_MLX4_PMD=n/"
-                             + "CONFIG_RTE_LIBRTE_MLX5_PMD=y/' config/common_base", "# ", 30)
-            self.set_build_options({'RTE_LIBRTE_MLX5_PMD': 'y',
-                                   'RTE_LIBRTE_MLX5_PMD': 'y'})
+            self.set_build_options({'RTE_LIBRTE_MLX5_PMD': 'y'})
 
 class DPDKtester(Tester):
 
diff --git a/framework/settings.py b/framework/settings.py
index e80fa66f..8b06ffac 100644
--- a/framework/settings.py
+++ b/framework/settings.py
@@ -250,7 +250,6 @@ PERF_SETTING = "DTS_PERF_ONLY"
 FUNC_SETTING = "DTS_FUNC_ONLY"
 HOST_DRIVER_SETTING = "DTS_HOST_DRIVER"
 HOST_DRIVER_MODE_SETTING = "DTS_HOST_DRIVER_MODE"
-HOST_BUILD_TYPE_SETTING = "DTS_HOST_BUILD_TYPE"
 HOST_NIC_SETTING = "DTS_HOST_NIC"
 HOST_SHARED_LIB_SETTING = "DTS_HOST_SHARED_LIB"
 HOST_SHARED_LIB_PATH = "DTS_HOST_SHARED_LIB_PATH"
diff --git a/framework/virt_dut.py b/framework/virt_dut.py
index bde65667..b09d0239 100644
--- a/framework/virt_dut.py
+++ b/framework/virt_dut.py
@@ -40,7 +40,6 @@ from .config import AppNameConf, PortConf
 from .dut import Dut
 from .project_dpdk import DPDKdut
 from .settings import (
-    HOST_BUILD_TYPE_SETTING,
     LOG_NAME_SEP,
     NICS,
     get_netdev,
@@ -233,11 +232,7 @@ class VirtDut(DPDKdut):
         name_cfg = AppNameConf()
         self.apps_name_conf = name_cfg.load_app_name_conf()
 
-        # get apps name of current build type
-        build_type = load_global_setting(HOST_BUILD_TYPE_SETTING)
-        if build_type not in self.apps_name_conf:
-            raise Exception('please config the apps name in app_name.cfg of build type:%s' % build_type)
-        self.apps_name = self.apps_name_conf[build_type]
+        self.apps_name = self.apps_name_conf['meson']
         # use the dut target directory instead of 'target' string in app name
         for app in self.apps_name:
             cur_app_path = self.apps_name[app].replace('target', self.target)
-- 
2.33.1.windows.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [dts] [PATCH V1 4/4] tests/*: removed makefile from test suite
  2021-11-17  8:54 [dts] [PATCH V1 1/4] executions/execution*: removed makefile from configure file DongJunX
  2021-11-17  8:54 ` [dts] [PATCH V1 2/4] doc/dts_gsg: removed makefile from user guide document DongJunX
  2021-11-17  8:54 ` [dts] [PATCH V1 3/4] framework/*: removed makefile from framework DongJunX
@ 2021-11-17  8:54 ` DongJunX
  2021-11-18  8:23   ` David Marchand
  2 siblings, 1 reply; 5+ messages in thread
From: DongJunX @ 2021-11-17  8:54 UTC (permalink / raw)
  To: qinx.sun, weix.ling, yanx.xia, yux.jiang, zhiminx.huang,
	hailinx.xu, songx.jiale
  Cc: dts

Signed-off-by: DongJunX <junx.dong@intel.com>
---
 tests/TestSuite_compressdev_isal_pmd.py       |  9 ----
 tests/TestSuite_compressdev_qat_pmd.py        |  7 ---
 tests/TestSuite_compressdev_zlib_pmd.py       |  9 ----
 tests/TestSuite_crypto_perf_cryptodev_perf.py | 10 ++---
 tests/TestSuite_external_mempool_handler.py   |  1 -
 tests/TestSuite_fips_cryptodev.py             | 42 +++++++++---------
 tests/TestSuite_ieee1588.py                   |  4 --
 tests/TestSuite_ipsec_gw_cryptodev_func.py    |  2 +-
 tests/TestSuite_kni.py                        |  6 ---
 tests/TestSuite_l2fwd_cryptodev_func.py       |  2 +-
 tests/TestSuite_packet_capture.py             |  9 ----
 tests/TestSuite_pmd.py                        |  1 -
 tests/TestSuite_power_branch_ratio.py         | 25 +++--------
 tests/TestSuite_power_pbf.py                  | 13 +-----
 tests/TestSuite_power_telemetry.py            | 16 +++----
 tests/TestSuite_unit_tests_cryptodev_func.py  |  2 +-
 tests/TestSuite_unit_tests_kni.py             |  2 -
 tests/TestSuite_vhost_1024_ethports.py        | 12 +----
 .../TestSuite_virtio_ipsec_cryptodev_func.py  |  6 ---
 tests/TestSuite_virtio_perf_cryptodev_func.py |  5 ---
 tests/TestSuite_virtio_unit_cryptodev_func.py |  2 -
 tests/TestSuite_vmdq_dcb.py                   |  2 -
 tests/cryptodev_common.py                     | 44 +------------------
 23 files changed, 42 insertions(+), 189 deletions(-)

diff --git a/tests/TestSuite_compressdev_isal_pmd.py b/tests/TestSuite_compressdev_isal_pmd.py
index 559c68de..93e41ca9 100644
--- a/tests/TestSuite_compressdev_isal_pmd.py
+++ b/tests/TestSuite_compressdev_isal_pmd.py
@@ -53,10 +53,6 @@ class TestCompressdevIsalPmd(TestCase):
         cc.default_opts = copy.deepcopy(self.opts)
 
     def prepare_dpdk(self):
-        self.dut.send_expect(
-            "sed -i 's/CONFIG_RTE_COMPRESSDEV_TEST=n$/CONFIG_RTE_COMPRESSDEV_TEST=y/' config/common_base", "# ")
-        self.dut.send_expect(
-            "sed -i 's/CONFIG_RTE_LIBRTE_PMD_ISAL=n$/CONFIG_RTE_LIBRTE_PMD_ISAL=y/' config/common_base", "# ")
         self.dut.build_install_dpdk(self.dut.target)
 
     def test_isal_pmd_unit_test(self):
@@ -87,11 +83,6 @@ class TestCompressdevIsalPmd(TestCase):
 
     def tear_down_all(self):
         self.dut.kill_all()
-
-        self.dut.send_expect(
-            "sed -i 's/CONFIG_RTE_COMPRESSDEV_TEST=y$/CONFIG_RTE_COMPRESSDEV_TEST=n/' config/common_base", "# ")
-        self.dut.send_expect(
-            "sed -i 's/CONFIG_RTE_LIBRTE_PMD_ISAL=y$/CONFIG_RTE_LIBRTE_PMD_ISAL=n/' config/common_base", "# ")
         self.dut.build_install_dpdk(self.dut.target)
 
         if not self._perf_result:
diff --git a/tests/TestSuite_compressdev_qat_pmd.py b/tests/TestSuite_compressdev_qat_pmd.py
index 38f0bff3..13b7bb57 100644
--- a/tests/TestSuite_compressdev_qat_pmd.py
+++ b/tests/TestSuite_compressdev_qat_pmd.py
@@ -55,8 +55,6 @@ class TestCompressdevQatPmd(TestCase):
         cc.default_opts = copy.deepcopy(self.opts)
 
     def prepare_dpdk(self):
-        self.dut.send_expect(
-            "sed -i 's/CONFIG_RTE_COMPRESSDEV_TEST=n$/CONFIG_RTE_COMPRESSDEV_TEST=y/' config/common_base", "# ")
         self.dut.build_install_dpdk(self.dut.target)
 
     def get_perf_default_device(self, dev_num=3):
@@ -153,11 +151,6 @@ class TestCompressdevQatPmd(TestCase):
 
     def tear_down_all(self):
         self.dut.kill_all()
-
-        self.dut.send_expect(
-            "sed -i 's/CONFIG_RTE_COMPRESSDEV_TEST=y$/CONFIG_RTE_COMPRESSDEV_TEST=n/' config/common_base", "# ")
-        self.dut.send_expect(
-            "sed -i 's/CONFIG_RTE_LIBRTE_PMD_QAT_SYM=y$/CONFIG_RTE_LIBRTE_PMD_QAT_SYM=n/' config/common_base", "# ")
         self.dut.build_install_dpdk(self.dut.target)
 
         if not self._perf_result:
diff --git a/tests/TestSuite_compressdev_zlib_pmd.py b/tests/TestSuite_compressdev_zlib_pmd.py
index f1b3d4c4..574a6061 100644
--- a/tests/TestSuite_compressdev_zlib_pmd.py
+++ b/tests/TestSuite_compressdev_zlib_pmd.py
@@ -54,10 +54,6 @@ class TestCompressdevZlibPmd(TestCase):
         cc.default_opts = copy.deepcopy(self.opts)
 
     def prepare_dpdk(self):
-        self.dut.send_expect(
-            "sed -i 's/CONFIG_RTE_COMPRESSDEV_TEST=n$/CONFIG_RTE_COMPRESSDEV_TEST=y/' config/common_base", "# ")
-        self.dut.send_expect(
-            "sed -i 's/CONFIG_RTE_LIBRTE_PMD_ZLIB=n$/CONFIG_RTE_LIBRTE_PMD_ZLIB=y/' config/common_base", "# ")
         self.dut.build_install_dpdk(self.dut.target)
 
     def test_zlib_pmd_unit_test(self):
@@ -88,11 +84,6 @@ class TestCompressdevZlibPmd(TestCase):
 
     def tear_down_all(self):
         self.dut.kill_all()
-
-        self.dut.send_expect(
-            "sed -i 's/CONFIG_RTE_COMPRESSDEV_TEST=y$/CONFIG_RTE_COMPRESSDEV_TEST=n/' config/common_base", "# ")
-        self.dut.send_expect(
-            "sed -i 's/CONFIG_RTE_LIBRTE_PMD_ZLIB=y$/CONFIG_RTE_LIBRTE_PMD_ZLIB=n/' config/common_base", "# ")
         self.dut.build_install_dpdk(self.dut.target)
 
         if not self._perf_result:
diff --git a/tests/TestSuite_crypto_perf_cryptodev_perf.py b/tests/TestSuite_crypto_perf_cryptodev_perf.py
index 759c5186..39be86c1 100644
--- a/tests/TestSuite_crypto_perf_cryptodev_perf.py
+++ b/tests/TestSuite_crypto_perf_cryptodev_perf.py
@@ -86,13 +86,9 @@ class PerfTestsCryptodev(TestCase):
             self.dut.session.copy_file_to(file, self.dut_file_dir)
 
     def tear_down_all(self):
-        cc.clear_dpdk_config(self)
-
-        if not self._perf_result:
-            return
-
-        with open(self.logger.log_path + "/" + "perf_cryptodev_result.json", "a") as fv:
-            json.dump(self._perf_result, fv, indent=4)
+        if self._perf_result:
+            with open(self.logger.log_path + "/" + "perf_cryptodev_result.json", "a") as fv:
+                json.dump(self._perf_result, fv, indent=4)
 
     def set_up(self):
         pass
diff --git a/tests/TestSuite_external_mempool_handler.py b/tests/TestSuite_external_mempool_handler.py
index cee22d0f..d747a9da 100644
--- a/tests/TestSuite_external_mempool_handler.py
+++ b/tests/TestSuite_external_mempool_handler.py
@@ -60,7 +60,6 @@ class TestExternalMempool(TestCase):
         pass
 
     def change_mempool_ops(self, ops=''):
-        self.dut.send_expect("sed -i 's/CONFIG_RTE_MBUF_DEFAULT_MEMPOOL_OPS=.*$/CONFIG_RTE_MBUF_DEFAULT_MEMPOOL_OPS=\"%s\"/' ./config/common_base" % ops, "# ")
         self.dut.set_build_options({'RTE_MBUF_DEFAULT_MEMPOOL_OPS': ops})
         self.dut.build_install_dpdk(self.target)
 
diff --git a/tests/TestSuite_fips_cryptodev.py b/tests/TestSuite_fips_cryptodev.py
index 39b30c6a..8731b109 100644
--- a/tests/TestSuite_fips_cryptodev.py
+++ b/tests/TestSuite_fips_cryptodev.py
@@ -43,8 +43,8 @@ class FipCryptodev(TestCase):
         if not cc.is_build_skip(self):
             cc.build_dpdk_with_cryptodev(self)
         out = self.dut.build_dpdk_apps("./examples/fips_validation")
-        self.verify("Error"not in out,"Compilation error")
-        self.verify("No such"not in out,"Compilation error")
+        self.verify("Error"not in out, "Compilation error")
+        self.verify("No such"not in out, "Compilation error")
         self.vf_driver = self.get_suite_cfg()['vf_driver']
         cc.bind_qat_device(self, "vfio-pci")
         self._app_path = self.dut.apps_name['fips_validation']
@@ -54,7 +54,7 @@ class FipCryptodev(TestCase):
             "cryptodev": None,
             "path-is-folder": "",
             "cryptodev-id": 0,
-            "self-test":"",
+            "self-test": "",
         }
         self.FIP_path = "/root/FIPS"
 
@@ -65,7 +65,7 @@ class FipCryptodev(TestCase):
         self.dut.kill_all()
 
     def tear_down_all(self):
-        cc.clear_dpdk_config(self)
+        pass
 
     # Private functions
     def _get_fips_opt_str(self):
@@ -86,14 +86,14 @@ class FipCryptodev(TestCase):
     def compare_resp_file(self,eal_opt_str,fips_opt_str):
         out = self._run_fips(eal_opt_str, fips_opt_str)
         check_out = out[out.index("Done"):]
-        self.verify("Error" not in check_out," req file error")
+        self.verify("Error" not in check_out, " req file error")
         rep_list = re.findall(r"FIPS/(.*)/req/(.*).req", out)
 
         for alog_name, file_name in rep_list:
             out = self.dut.send_expect("diff %s/%s/resp/%s.rsp %s/%s/fax/%s.rsp | grep -v '#' | grep -v '\---'" % (
             self.FIP_path, alog_name, file_name, self.FIP_path, alog_name, file_name), "#")
             lines = re.split('\r\n', out)
-            self.verify(len(lines) <= 2, "%s.req file comparison failed!"%file_name)
+            self.verify(len(lines) <= 2, "%s.req file comparison failed!" % file_name)
 
     def test_fips_aesni_mb_aes(self):
         eal_opt_str = cc.get_eal_opt_str(self)
@@ -121,72 +121,72 @@ class FipCryptodev(TestCase):
         self.compare_resp_file(eal_opt_str, fips_opt_str)
 
     def test_fips_qat_gcm(self):
-        eal_opt_str = cc.get_eal_opt_str(self,{"vdev":None})
+        eal_opt_str = cc.get_eal_opt_str(self, {"vdev": None})
         fips_opt_str = self._get_fips_opt_str()
         self.compare_resp_file(eal_opt_str, fips_opt_str)
 
     def test_fips_qat_aes(self):
-        eal_opt_str = cc.get_eal_opt_str(self,{"vdev":None})
+        eal_opt_str = cc.get_eal_opt_str(self, {"vdev": None})
         fips_opt_str = self._get_fips_opt_str()
         self.compare_resp_file(eal_opt_str, fips_opt_str)
 
     def test_fips_qat_3des(self):
-        eal_opt_str = cc.get_eal_opt_str(self,{"vdev":None})
+        eal_opt_str = cc.get_eal_opt_str(self, {"vdev": None})
         fips_opt_str = self._get_fips_opt_str()
         self.compare_resp_file(eal_opt_str, fips_opt_str)
 
     def test_fips_qat_hmac(self):
-        eal_opt_str = cc.get_eal_opt_str(self,{"vdev":None})
+        eal_opt_str = cc.get_eal_opt_str(self, {"vdev": None})
         fips_opt_str = self._get_fips_opt_str()
         self.compare_resp_file(eal_opt_str, fips_opt_str)
 
     def test_fips_qat_ccm(self):
-        eal_opt_str = cc.get_eal_opt_str(self,{"vdev":None})
+        eal_opt_str = cc.get_eal_opt_str(self, {"vdev": None})
         fips_opt_str = self._get_fips_opt_str()
         self.compare_resp_file(eal_opt_str, fips_opt_str)
 
     def test_fips_qat_cmac(self):
-        eal_opt_str = cc.get_eal_opt_str(self,{"vdev":None})
+        eal_opt_str = cc.get_eal_opt_str(self, {"vdev": None})
         fips_opt_str = self._get_fips_opt_str()
         self.compare_resp_file(eal_opt_str, fips_opt_str)
 
     def test_fips_openssl_gcm(self):
-        eal_opt_str = cc.get_eal_opt_str(self,{"vdev":"crypto_openssl_pmd_1"})
+        eal_opt_str = cc.get_eal_opt_str(self, {"vdev": "crypto_openssl_pmd_1"})
         fips_opt_str = self._get_fips_opt_str()
         self.compare_resp_file(eal_opt_str, fips_opt_str)
 
     def test_fips_openssl_aes(self):
-        eal_opt_str = cc.get_eal_opt_str(self,{"vdev":"crypto_openssl_pmd_1"})
+        eal_opt_str = cc.get_eal_opt_str(self, {"vdev": "crypto_openssl_pmd_1"})
         fips_opt_str = self._get_fips_opt_str()
         self.compare_resp_file(eal_opt_str, fips_opt_str)
 
     def test_fips_openssl_3des(self):
-        eal_opt_str = cc.get_eal_opt_str(self,{"vdev":"crypto_openssl_pmd_1"})
+        eal_opt_str = cc.get_eal_opt_str(self, {"vdev": "crypto_openssl_pmd_1"})
         fips_opt_str = self._get_fips_opt_str()
         self.compare_resp_file(eal_opt_str, fips_opt_str)
 
     def test_fips_openssl_hmac(self):
-        eal_opt_str = cc.get_eal_opt_str(self,{"vdev":"crypto_openssl_pmd_1"})
+        eal_opt_str = cc.get_eal_opt_str(self, {"vdev": "crypto_openssl_pmd_1"})
         fips_opt_str = self._get_fips_opt_str()
         self.compare_resp_file(eal_opt_str, fips_opt_str)
 
     def test_fips_openssl_ccm(self):
-        eal_opt_str = cc.get_eal_opt_str(self,{"vdev":"crypto_openssl_pmd_1"})
+        eal_opt_str = cc.get_eal_opt_str(self, {"vdev": "crypto_openssl_pmd_1"})
         fips_opt_str = self._get_fips_opt_str()
         self.compare_resp_file(eal_opt_str, fips_opt_str)
 
     def  test_fips_aesni_gcm_gcm(self):
-        eal_opt_str = cc.get_eal_opt_str(self,{"vdev":"crypto_aesni_gcm_pmd_1"})
+        eal_opt_str = cc.get_eal_opt_str(self, {"vdev": "crypto_aesni_gcm_pmd_1"})
         fips_opt_str = self._get_fips_opt_str()
         self.compare_resp_file(eal_opt_str, fips_opt_str)
 
     def test_fips_self_test(self):
-        eal_opt_str = cc.get_eal_opt_str(self,{"l":None,"n":None,})
+        eal_opt_str = cc.get_eal_opt_str(self, {"l": None, "n": None})
         fips_opt_str = self._get_fips_opt_str()
         self.compare_resp_file(eal_opt_str, fips_opt_str)
 
     def test_fips_broken_test(self):
-        eal_opt_str = cc.get_eal_opt_str(self,{"l":None,"n":None,})
-        fips_opt_str = cc.get_opt_str(self, self._default_fips_opts,{"cryptodev-id":None, "broken-test-id":15, "broken-test-dir":"dec"})
+        eal_opt_str = cc.get_eal_opt_str(self, {"l": None, "n": None})
+        fips_opt_str = cc.get_opt_str(self, self._default_fips_opts, {"cryptodev-id": None, "broken-test-id": 15, "broken-test-dir": "dec"})
         out = self._run_fips(eal_opt_str, fips_opt_str)
         self.verify("Failed init" in out, "test Failed!")
diff --git a/tests/TestSuite_ieee1588.py b/tests/TestSuite_ieee1588.py
index e17b1699..d61f2a53 100644
--- a/tests/TestSuite_ieee1588.py
+++ b/tests/TestSuite_ieee1588.py
@@ -55,8 +55,6 @@ class TestIeee1588(TestCase):
         self.verify(len(dutPorts) > 0, "No ports found for " + self.nic)
 
         # Change the config file to support IEEE1588 and recompile the package.
-        self.dut.send_expect(
-            "sed -i -e 's/IEEE1588=n$/IEEE1588=y/' config/common_base", "# ", 30)
         self.dut.set_build_options({'RTE_LIBRTE_IEEE1588': 'y'})
         self.dut.skip_setup = False
         self.dut.build_install_dpdk(self.target)
@@ -173,7 +171,5 @@ class TestIeee1588(TestCase):
         self.dut.send_expect("quit", "# ", 30)
 
         # Restore the config file and recompile the package.
-        self.dut.send_expect(
-            "sed -i -e 's/IEEE1588=y$/IEEE1588=n/' config/common_base", "# ", 30)
         self.dut.set_build_options({'RTE_LIBRTE_IEEE1588': 'n'})
         self.dut.build_install_dpdk(self.target)
diff --git a/tests/TestSuite_ipsec_gw_cryptodev_func.py b/tests/TestSuite_ipsec_gw_cryptodev_func.py
index a5d6e775..bfdc1271 100644
--- a/tests/TestSuite_ipsec_gw_cryptodev_func.py
+++ b/tests/TestSuite_ipsec_gw_cryptodev_func.py
@@ -97,7 +97,7 @@ class TestIPsecGW(TestCase):
         self.dut.kill_all()
 
     def tear_down_all(self):
-        cc.clear_dpdk_config(self)
+        pass
 
     def test_qat_aes_128_cbc_ipv4_tunnel(self):
         self._execute_ipsec_gw_test()
diff --git a/tests/TestSuite_kni.py b/tests/TestSuite_kni.py
index 85289d37..151668c3 100644
--- a/tests/TestSuite_kni.py
+++ b/tests/TestSuite_kni.py
@@ -259,9 +259,6 @@ class TestKni(TestCase):
         out = self.dut.send_expect("which brctl", "# ")
         self.verify('no brctl' not in out,
                     "The linux tool brctl is needed to run this test suite")
-
-        self.dut.send_expect("sed -i -e 's/KNI_KMOD_ETHTOOL=n$/KNI_KMOD_ETHTOOL=y/' config/common_base", "# ", 30)
-        self.dut.send_expect("sed -i -e 's/CONFIG_RTE_KNI_KMOD=n$/CONFIG_RTE_KNI_KMOD=y/' config/common_base", "# ", 30)
         self.dut.build_install_dpdk(self.target)
 
         out = self.dut.build_dpdk_apps("./examples/kni")
@@ -1225,9 +1222,6 @@ class TestKni(TestCase):
         """
         Run after each test suite.
         """
-
-        self.dut.send_expect("sed -i -e 's/KNI_KMOD_ETHTOOL=y$/KNI_KMOD_ETHTOOL=n/' config/common_base", "# ", 30)
         self.dut.build_install_dpdk(self.target)
-
         self.dut.kill_all()
         self.dut.send_expect("rmmod rte_kni", "# ", 10)
diff --git a/tests/TestSuite_l2fwd_cryptodev_func.py b/tests/TestSuite_l2fwd_cryptodev_func.py
index 1e8ce549..1b9129af 100644
--- a/tests/TestSuite_l2fwd_cryptodev_func.py
+++ b/tests/TestSuite_l2fwd_cryptodev_func.py
@@ -438,7 +438,7 @@ class TestL2fwdCrypto(TestCase):
         self.dut.kill_all()
 
     def tear_down_all(self):
-        cc.clear_dpdk_config(self)
+        pass
 
     def __test_vector_to_cmd(self, test_vector, core_mask="", port_mask=""):
         cores = ','.join(self.core_list)
diff --git a/tests/TestSuite_packet_capture.py b/tests/TestSuite_packet_capture.py
index 4440c5f3..5ad7ed37 100644
--- a/tests/TestSuite_packet_capture.py
+++ b/tests/TestSuite_packet_capture.py
@@ -815,12 +815,7 @@ class TestPacketCapture(TestCase):
            not self.is_existed_on_crb(self.pdump_log, crb='tester'):
             cmd = "mkdir -p {0}".format(self.pdump_log)
             self.tester.alt_session.send_expect(cmd, "# ")
-        self.pcap_SW = "CONFIG_RTE_LIBRTE_PMD_PCAP"
-        self.SW_file = os.path.join(self.target_dir, 'config/common_base')
         if not (self.dut_skip_compile and self.check_pcap_lib()):
-            cmd = "sed -i -e 's/{0}=n$/{0}=y/' {1}".format(
-                self.pcap_SW, self.SW_file)
-            self.dut.alt_session.send_expect(cmd, "# ", 30)
             self.dut.skip_setup = False
             self.dut.build_install_dpdk(self.target)
         # secondary process (dpdk-pdump)
@@ -879,10 +874,6 @@ class TestPacketCapture(TestCase):
             self.session_ex = None
         # Restore the config file and recompile the package.
         if self.check_pcap_lib():
-            self.dut.alt_session.send_expect(
-                ("sed -i -e 's/{0}=y$/{0}=n/' "
-                 "{1}").format(self.pcap_SW, self.SW_file),
-                "# ", 120)
             # temporary disable skip_setup
             skip_setup = self.dut.skip_setup
             self.dut.skip_setup = True
diff --git a/tests/TestSuite_pmd.py b/tests/TestSuite_pmd.py
index 52250023..98421765 100644
--- a/tests/TestSuite_pmd.py
+++ b/tests/TestSuite_pmd.py
@@ -75,7 +75,6 @@ class TestPmd(TestCase):
         self.blocklist = ""
 
         # Update config file and rebuild to get best perf on FVL
-        self.dut.send_expect("sed -i -e 's/CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=n/CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=y/' ./config/common_base", "#", 20)
         self.dut.build_install_dpdk(self.target)
 
         # Based on h/w type, choose how many ports to use
diff --git a/tests/TestSuite_power_branch_ratio.py b/tests/TestSuite_power_branch_ratio.py
index dee2cc11..7484d130 100644
--- a/tests/TestSuite_power_branch_ratio.py
+++ b/tests/TestSuite_power_branch_ratio.py
@@ -44,8 +44,7 @@ from pprint import pformat
 from framework.exception import VerifyFailure
 from framework.packet import Packet
 from framework.pktgen import TRANSMIT_CONT
-from framework.qemu_libvirt import LibvirtKvm
-from framework.settings import HEADER_SIZE, HOST_BUILD_TYPE_SETTING, load_global_setting
+from framework.settings import HEADER_SIZE
 from framework.test_case import TestCase
 from framework.utils import create_mask as dts_create_mask
 
@@ -224,15 +223,8 @@ class TestPowerBranchRatio(TestCase):
         return sw_table
 
     def preset_compilation(self):
-        if 'meson' == load_global_setting(HOST_BUILD_TYPE_SETTING):
-            compile_SWs = self.compile_switch + ["CONFIG_RTE_LIBRTE_I40E_PMD"]
-            self.dut.set_build_options(dict([(sw[7:], 'y') for sw in compile_SWs]))
-        else:
-            for sw in self.compile_switch:
-                cmd = ("sed -i -e "
-                       "'s/{0}=n$/{0}=y/' "
-                       "{1}/config/common_base").format(sw, self.target_dir)
-                self.d_a_con(cmd)
+        compile_SWs = self.compile_switch + ["CONFIG_RTE_LIBRTE_I40E_PMD"]
+        self.dut.set_build_options(dict([(sw[7:], 'y') for sw in compile_SWs]))
         # re-compile dpdk source code
         self.dut.build_install_dpdk(self.target)
 
@@ -247,15 +239,8 @@ class TestPowerBranchRatio(TestCase):
             except Exception as e:
                 self.logger.error(traceback.format_exc())
             # restore compilation
-            if 'meson' == load_global_setting(HOST_BUILD_TYPE_SETTING):
-                self.dut.set_build_options(
-                    dict([(sw[7:], 'n') for sw in self.compile_switch]))
-            else:
-                for sw in self.compile_switch:
-                    cmd = ("sed -i -e "
-                           "'s/{0}=y$/{0}=n/' "
-                           "{1}/config/common_base").format(sw, self.target_dir)
-                    self.d_a_con(cmd)
+            self.dut.set_build_options(
+                dict([(sw[7:], 'n') for sw in self.compile_switch]))
             # re-compile dpdk source code
             self.dut.build_install_dpdk(self.target)
 
diff --git a/tests/TestSuite_power_pbf.py b/tests/TestSuite_power_pbf.py
index 42d939cd..832f5c57 100644
--- a/tests/TestSuite_power_pbf.py
+++ b/tests/TestSuite_power_pbf.py
@@ -31,18 +31,14 @@
 
 import json
 import os
-import random
 import re
 import shutil
 import time
 import traceback
+
 from collections import Counter
 from pprint import pformat
-
 from framework.exception import VerifyFailure
-
-# import framework.dts as dts libs
-from framework.settings import HOST_BUILD_TYPE_SETTING, load_global_setting
 from framework.test_case import TestCase
 from framework.utils import create_mask
 
@@ -149,12 +145,7 @@ class TestPowerPbf(TestCase):
         self.create_powermonitor_folder()
         # open debug SW
         SW = "CONFIG_RTE_LIBRTE_POWER_DEBUG"
-        if 'meson' == load_global_setting(HOST_BUILD_TYPE_SETTING):
-            self.dut.set_build_options({SW[7:]: 'y'})
-        else:
-            cmd = "sed -i -e 's/{0}=n$/{0}=y/' {1}/config/common_base".format(
-                SW, self.target_dir)
-            self.d_a_con(cmd)
+        self.dut.set_build_options({SW[7:]: 'y'})
         self.dut.build_install_dpdk(self.target)
         # set up vm power management binary process setting
         self.vm_power_mgr = self.prepare_binary('vm_power_manager')
diff --git a/tests/TestSuite_power_telemetry.py b/tests/TestSuite_power_telemetry.py
index d8182ce2..dda942a4 100644
--- a/tests/TestSuite_power_telemetry.py
+++ b/tests/TestSuite_power_telemetry.py
@@ -45,7 +45,7 @@ from pprint import pformat
 from framework.exception import VerifyFailure
 from framework.packet import Packet
 from framework.pktgen import TRANSMIT_CONT
-from framework.settings import HEADER_SIZE, HOST_BUILD_TYPE_SETTING, load_global_setting
+from framework.settings import HEADER_SIZE
 from framework.test_case import TestCase
 from framework.utils import create_mask as dts_create_mask
 
@@ -122,17 +122,11 @@ class TestPowerTelemetry(TestCase):
         return result
 
     def preset_compilation(self):
-        if self.dut.skip_setup:
-            return
-        SW = "CONFIG_RTE_LIBRTE_TELEMETRY"
-        if 'meson' == load_global_setting(HOST_BUILD_TYPE_SETTING):
+        if not self.dut.skip_setup:
+            SW = "CONFIG_RTE_LIBRTE_TELEMETRY"
             self.dut.set_build_options({SW[7:]: 'y'})
-        else:
-            cmd = "sed -i -e 's/{0}=n$/{0}=y/' {1}/config/common_base".format(
-                SW, self.target_dir)
-            self.d_a_con(cmd)
-        # re-compile dpdk source code
-        self.dut.build_install_dpdk(self.target)
+            # re-compile dpdk source code
+            self.dut.build_install_dpdk(self.target)
 
     def prepare_binary(self, name):
         example_dir = "examples/" + name
diff --git a/tests/TestSuite_unit_tests_cryptodev_func.py b/tests/TestSuite_unit_tests_cryptodev_func.py
index d2117255..02d1b092 100644
--- a/tests/TestSuite_unit_tests_cryptodev_func.py
+++ b/tests/TestSuite_unit_tests_cryptodev_func.py
@@ -51,7 +51,7 @@ class UnitTestsCryptodev(TestCase):
         self.dut.kill_all()
 
     def tear_down_all(self):
-        cc.clear_dpdk_config(self)
+        pass
 
     def _get_crypto_device(self, num):
         device = {}
diff --git a/tests/TestSuite_unit_tests_kni.py b/tests/TestSuite_unit_tests_kni.py
index 5ad19d15..91283b8a 100644
--- a/tests/TestSuite_unit_tests_kni.py
+++ b/tests/TestSuite_unit_tests_kni.py
@@ -73,8 +73,6 @@ class TestUnitTestsKni(TestCase):
 
         KNI Prerequisites
         """
-        self.dut.send_expect("sed -i -e 's/KNI_KMOD_ETHTOOL=n$/KNI_KMOD_ETHTOOL=y/' config/common_base", "# ", 30)
-        self.dut.send_expect("sed -i -e 's/CONFIG_RTE_KNI_KMOD=n$/CONFIG_RTE_KNI_KMOD=y/' config/common_base", "# ", 30)
         self.dut.set_build_options({'KNI_KMOD_ETHTOOL': 'y'})
         self.dut.set_build_options({'RTE_KNI_KMOD': 'y'})
         self.dut.build_install_dpdk(self.target)
diff --git a/tests/TestSuite_vhost_1024_ethports.py b/tests/TestSuite_vhost_1024_ethports.py
index 3b20f3e0..d2a643c2 100644
--- a/tests/TestSuite_vhost_1024_ethports.py
+++ b/tests/TestSuite_vhost_1024_ethports.py
@@ -65,18 +65,10 @@ class TestVhost1024Ethports(TestCase):
         self.vhost_user = self.dut.new_session(suite='vhost-user')
 
     def build_user_dpdk(self):
-        if self.dut.build_type == "meson":
-            self.dut.build_install_dpdk(self.target, extra_options="-Dmax_ethports=1024")
-        else:
-            self.dut.send_expect("sed -i 's/CONFIG_RTE_MAX_ETHPORTS=32$/CONFIG_RTE_MAX_ETHPORTS=1024/' config/common_base", '#', 30)
-            self.dut.build_install_dpdk(self.target)
+        self.dut.build_install_dpdk(self.target, extra_options="-Dmax_ethports=1024")
 
     def restore_dpdk(self):
-        if self.dut.build_type == "meson":
-            self.dut.build_install_dpdk(self.target, extra_options="-Dmax_ethports=32")
-        else:
-            self.dut.send_expect("sed -i 's/CONFIG_RTE_MAX_ETHPORTS=1024$/CONFIG_RTE_MAX_ETHPORTS=32/' config/common_base", '#', 30)
-            self.dut.build_install_dpdk(self.target)
+        self.dut.build_install_dpdk(self.target, extra_options="-Dmax_ethports=32")
 
     @property
     def check_2M_env(self):
diff --git a/tests/TestSuite_virtio_ipsec_cryptodev_func.py b/tests/TestSuite_virtio_ipsec_cryptodev_func.py
index c4f62b86..d5374209 100644
--- a/tests/TestSuite_virtio_ipsec_cryptodev_func.py
+++ b/tests/TestSuite_virtio_ipsec_cryptodev_func.py
@@ -96,10 +96,6 @@ class VirtioCryptodevIpsecTest(TestCase):
         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)
         user_dut.set_build_options({'RTE_LIBRTE_PMD_AESNI_MB': 'y'})
         user_dut.build_install_dpdk(self.target)
         user_dut.build_dpdk_apps("./examples/ipsec-secgw")
@@ -371,5 +367,3 @@ class VirtioCryptodevIpsecTest(TestCase):
         self.dut.send_expect("killall -s INT %s" % self.app_name, "#")
         self.dut_execut_cmd("killall -s INT qemu-system-x86_64")
         self.dut_execut_cmd("rm -r /tmp/*")
-
-        cc.clear_dpdk_config(self)
diff --git a/tests/TestSuite_virtio_perf_cryptodev_func.py b/tests/TestSuite_virtio_perf_cryptodev_func.py
index 92765675..f8b288c8 100644
--- a/tests/TestSuite_virtio_perf_cryptodev_func.py
+++ b/tests/TestSuite_virtio_perf_cryptodev_func.py
@@ -117,10 +117,6 @@ class VirtioCryptodevPerfTest(TestCase):
         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)
         user_dut.set_build_options({'RTE_LIBRTE_PMD_AESNI_MB': 'y'})
         user_dut.build_install_dpdk(self.target)
 
@@ -257,4 +253,3 @@ class VirtioCryptodevPerfTest(TestCase):
         self.dut.send_expect("killall -s INT %s" % self.app_name, "#")
         self.dut_execut_cmd("killall -s INT qemu-system-x86_64")
         self.dut_execut_cmd("rm -r /tmp/*")
-        cc.clear_dpdk_config(self)
diff --git a/tests/TestSuite_virtio_unit_cryptodev_func.py b/tests/TestSuite_virtio_unit_cryptodev_func.py
index 6ccfef7f..fd5b30fe 100644
--- a/tests/TestSuite_virtio_unit_cryptodev_func.py
+++ b/tests/TestSuite_virtio_unit_cryptodev_func.py
@@ -202,5 +202,3 @@ class VirtioCryptodevUnitTest(TestCase):
         self.dut.send_expect("killall -s INT %s" % self.app_name, "#")
         self.dut_execut_cmd("killall -s INT qemu-system-x86_64")
         self.dut_execut_cmd("rm -r /tmp/*")
-
-        cc.clear_dpdk_config(self)
diff --git a/tests/TestSuite_vmdq_dcb.py b/tests/TestSuite_vmdq_dcb.py
index b5714469..c7f60141 100644
--- a/tests/TestSuite_vmdq_dcb.py
+++ b/tests/TestSuite_vmdq_dcb.py
@@ -93,8 +93,6 @@ class TestVmdqDcb(TestCase):
         """
         Rebuild dpdk
         """
-        self.dut.send_expect("sed -i -e 's/CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM=.*$/CONFIG_RTE_LIBRTE_I40E_"
-                             "QUEUE_NUM_PER_VM=%s/' ./config/common_base" % nb_queue_per_vm, "#", 20)
         self.dut.set_build_options({'RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM': nb_queue_per_vm})
         self.dut.build_install_dpdk(self.target)
 
diff --git a/tests/cryptodev_common.py b/tests/cryptodev_common.py
index e3c58cdc..2856e322 100644
--- a/tests/cryptodev_common.py
+++ b/tests/cryptodev_common.py
@@ -74,43 +74,20 @@ def build_dpdk_with_cryptodev(test_case):
     test_case.dut.send_expect(
         "export LD_LIBRARY_PATH={}".format(fip_library_path), "#")
 
-    test_case.dut.send_expect(
-        "sed -i 's/CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n$/CONFIG_RTE_LIBRTE_PMD_AESNI_MB=y/' config/common_base", "# ")
     test_case.dut.set_build_options({'RTE_LIBRTE_PMD_AESNI_MB': 'y'})
-
-    test_case.dut.send_expect(
-        "sed -i 's/CONFIG_RTE_LIBRTE_PMD_QAT_SYM=n$/CONFIG_RTE_LIBRTE_PMD_QAT_SYM=y/' config/common_base", "# ")
     test_case.dut.set_build_options({'RTE_LIBRTE_PMD_QAT_SYM': 'y'})
-
-    test_case.dut.send_expect(
-        "sed -i 's/CONFIG_RTE_LIBRTE_PMD_QAT_ASYM=n$/CONFIG_RTE_LIBRTE_PMD_QAT_ASYM=y/' config/common_base", "# ")
     test_case.dut.set_build_options({'RTE_LIBRTE_PMD_QAT_ASYM': 'y'})
-
-    test_case.dut.send_expect(
-        "sed -i 's/CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=n$/CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=y/' config/common_base", "# ")
     test_case.dut.set_build_options({'RTE_LIBRTE_PMD_AESNI_GCM': 'y'})
-
-    test_case.dut.send_expect(
-        "sed -i 's/CONFIG_RTE_LIBRTE_PMD_OPENSSL=n$/CONFIG_RTE_LIBRTE_PMD_OPENSSL=y/' config/common_base", "# ")
     test_case.dut.set_build_options({'RTE_LIBRTE_PMD_OPENSSL': 'y'})
-
-    test_case.dut.send_expect(
-        "sed -i 's/CONFIG_RTE_LIBRTE_PMD_SNOW3G=n$/CONFIG_RTE_LIBRTE_PMD_SNOW3G=y/' config/common_base", "# ")
     test_case.dut.set_build_options({'RTE_LIBRTE_PMD_SNOW3G': 'y'})
-
-    test_case.dut.send_expect(
-        "sed -i 's/CONFIG_RTE_LIBRTE_PMD_KASUMI=n$/CONFIG_RTE_LIBRTE_PMD_KASUMI=y/' config/common_base", "# ")
     test_case.dut.set_build_options({'RTE_LIBRTE_PMD_KASUMI': 'y'})
-
-    test_case.dut.send_expect(
-        "sed -i 's/CONFIG_RTE_LIBRTE_PMD_ZUC=n$/CONFIG_RTE_LIBRTE_PMD_ZUC=y/' config/common_base", "# ")
     test_case.dut.set_build_options({'RTE_LIBRTE_PMD_ZUC': 'y'})
 
     test_case.dut.skip_setup = False
     test_case.dut.build_install_dpdk(test_case.dut.target)
 
 
-def bind_qat_device(test_case, driver = "igb_uio"):
+def bind_qat_device(test_case, driver="igb_uio"):
     if driver == 'vfio-pci':
         test_case.dut.send_expect('modprobe vfio', '#', 10)
         test_case.dut.send_expect('modprobe vfio-pci', '#', 10)
@@ -168,25 +145,6 @@ def get_qat_devices(test_case, cpm_num=None, num=1):
     return dev_list
 
 
-def clear_dpdk_config(test_case):
-    test_case.dut.send_expect(
-        "sed -i 's/CONFIG_RTE_LIBRTE_PMD_AESNI_MB=y$/CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n/' config/common_base", "# ")
-    test_case.dut.send_expect(
-        "sed -i 's/CONFIG_RTE_LIBRTE_PMD_QAT_SYM=y$/CONFIG_RTE_LIBRTE_PMD_QAT_SYM=n/' config/common_base", "# ")
-    test_case.dut.send_expect(
-        "sed -i 's/CONFIG_RTE_LIBRTE_PMD_QAT_ASYM=y$/CONFIG_RTE_LIBRTE_PMD_QAT_ASYM=n/' config/common_base", "# ")
-    test_case.dut.send_expect(
-        "sed -i 's/CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=y$/CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=n/' config/common_base", "# ")
-    test_case.dut.send_expect(
-        "sed -i 's/CONFIG_RTE_LIBRTE_PMD_OPENSSL=y$/CONFIG_RTE_LIBRTE_PMD_OPENSSL=n/' config/common_base", "# ")
-    test_case.dut.send_expect(
-        "sed -i 's/CONFIG_RTE_LIBRTE_PMD_SNOW3G=y$/CONFIG_RTE_LIBRTE_PMD_SNOW3G=n/' config/common_base", "# ")
-    test_case.dut.send_expect(
-        "sed -i 's/CONFIG_RTE_LIBRTE_PMD_KASUMI=y$/CONFIG_RTE_LIBRTE_PMD_KASUMI=n/' config/common_base", "# ")
-    test_case.dut.send_expect(
-        "sed -i 's/CONFIG_RTE_LIBRTE_PMD_ZUC=y$/CONFIG_RTE_LIBRTE_PMD_ZUC=n/' config/common_base", "# ")
-
-
 default_eal_opts = {
     "c": None,
     "l": None,
-- 
2.33.1.windows.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [dts] [PATCH V1 4/4] tests/*: removed makefile from test suite
  2021-11-17  8:54 ` [dts] [PATCH V1 4/4] tests/*: removed makefile from test suite DongJunX
@ 2021-11-18  8:23   ` David Marchand
  0 siblings, 0 replies; 5+ messages in thread
From: David Marchand @ 2021-11-18  8:23 UTC (permalink / raw)
  To: DongJunX
  Cc: qinx.sun, Wei Ling, Yan Xia, Yu Jiang, Zhimin Huang, hailinx.xu,
	songx.jiale, dts

Hello,

On Wed, Nov 17, 2021 at 9:55 AM DongJunX <junx.dong@intel.com> wrote:


A commitlog is needed.

First, a general comment on this patch: please don't mix in unrelated
whitespace changes.

>
> Signed-off-by: DongJunX <junx.dong@intel.com>
> ---
>  tests/TestSuite_compressdev_isal_pmd.py       |  9 ----
>  tests/TestSuite_compressdev_qat_pmd.py        |  7 ---
>  tests/TestSuite_compressdev_zlib_pmd.py       |  9 ----
>  tests/TestSuite_crypto_perf_cryptodev_perf.py | 10 ++---
>  tests/TestSuite_external_mempool_handler.py   |  1 -
>  tests/TestSuite_fips_cryptodev.py             | 42 +++++++++---------
>  tests/TestSuite_ieee1588.py                   |  4 --
>  tests/TestSuite_ipsec_gw_cryptodev_func.py    |  2 +-
>  tests/TestSuite_kni.py                        |  6 ---
>  tests/TestSuite_l2fwd_cryptodev_func.py       |  2 +-
>  tests/TestSuite_packet_capture.py             |  9 ----
>  tests/TestSuite_pmd.py                        |  1 -
>  tests/TestSuite_power_branch_ratio.py         | 25 +++--------
>  tests/TestSuite_power_pbf.py                  | 13 +-----
>  tests/TestSuite_power_telemetry.py            | 16 +++----
>  tests/TestSuite_unit_tests_cryptodev_func.py  |  2 +-
>  tests/TestSuite_unit_tests_kni.py             |  2 -
>  tests/TestSuite_vhost_1024_ethports.py        | 12 +----
>  .../TestSuite_virtio_ipsec_cryptodev_func.py  |  6 ---
>  tests/TestSuite_virtio_perf_cryptodev_func.py |  5 ---
>  tests/TestSuite_virtio_unit_cryptodev_func.py |  2 -
>  tests/TestSuite_vmdq_dcb.py                   |  2 -
>  tests/cryptodev_common.py                     | 44 +------------------
>  23 files changed, 42 insertions(+), 189 deletions(-)
>
> diff --git a/tests/TestSuite_compressdev_isal_pmd.py b/tests/TestSuite_compressdev_isal_pmd.py
> index 559c68de..93e41ca9 100644
> --- a/tests/TestSuite_compressdev_isal_pmd.py
> +++ b/tests/TestSuite_compressdev_isal_pmd.py
> @@ -53,10 +53,6 @@ class TestCompressdevIsalPmd(TestCase):
>          cc.default_opts = copy.deepcopy(self.opts)
>
>      def prepare_dpdk(self):
> -        self.dut.send_expect(
> -            "sed -i 's/CONFIG_RTE_COMPRESSDEV_TEST=n$/CONFIG_RTE_COMPRESSDEV_TEST=y/' config/common_base", "# ")
> -        self.dut.send_expect(
> -            "sed -i 's/CONFIG_RTE_LIBRTE_PMD_ISAL=n$/CONFIG_RTE_LIBRTE_PMD_ISAL=y/' config/common_base", "# ")
>          self.dut.build_install_dpdk(self.dut.target)

This comment and the next one apply to all other hunks in this patch.

Is it necessary to call dut.build_install_dpdk here?
Since this test uses the default configuration, is dpdk built in
DPDKdut set_target() method not enough?


>
>      def test_isal_pmd_unit_test(self):
> @@ -87,11 +83,6 @@ class TestCompressdevIsalPmd(TestCase):
>
>      def tear_down_all(self):
>          self.dut.kill_all()
> -
> -        self.dut.send_expect(
> -            "sed -i 's/CONFIG_RTE_COMPRESSDEV_TEST=y$/CONFIG_RTE_COMPRESSDEV_TEST=n/' config/common_base", "# ")
> -        self.dut.send_expect(
> -            "sed -i 's/CONFIG_RTE_LIBRTE_PMD_ISAL=y$/CONFIG_RTE_LIBRTE_PMD_ISAL=n/' config/common_base", "# ")
>          self.dut.build_install_dpdk(self.dut.target)

There was no change in the configuration since the start of this test.
No need to recompile anything.

>
>          if not self._perf_result:
> diff --git a/tests/TestSuite_compressdev_qat_pmd.py b/tests/TestSuite_compressdev_qat_pmd.py
> index 38f0bff3..13b7bb57 100644
> --- a/tests/TestSuite_compressdev_qat_pmd.py
> +++ b/tests/TestSuite_compressdev_qat_pmd.py
> @@ -55,8 +55,6 @@ class TestCompressdevQatPmd(TestCase):
>          cc.default_opts = copy.deepcopy(self.opts)
>
>      def prepare_dpdk(self):
> -        self.dut.send_expect(
> -            "sed -i 's/CONFIG_RTE_COMPRESSDEV_TEST=n$/CONFIG_RTE_COMPRESSDEV_TEST=y/' config/common_base", "# ")
>          self.dut.build_install_dpdk(self.dut.target)
>
>      def get_perf_default_device(self, dev_num=3):
> @@ -153,11 +151,6 @@ class TestCompressdevQatPmd(TestCase):
>
>      def tear_down_all(self):
>          self.dut.kill_all()
> -
> -        self.dut.send_expect(
> -            "sed -i 's/CONFIG_RTE_COMPRESSDEV_TEST=y$/CONFIG_RTE_COMPRESSDEV_TEST=n/' config/common_base", "# ")
> -        self.dut.send_expect(
> -            "sed -i 's/CONFIG_RTE_LIBRTE_PMD_QAT_SYM=y$/CONFIG_RTE_LIBRTE_PMD_QAT_SYM=n/' config/common_base", "# ")
>          self.dut.build_install_dpdk(self.dut.target)
>
>          if not self._perf_result:
> diff --git a/tests/TestSuite_compressdev_zlib_pmd.py b/tests/TestSuite_compressdev_zlib_pmd.py
> index f1b3d4c4..574a6061 100644
> --- a/tests/TestSuite_compressdev_zlib_pmd.py
> +++ b/tests/TestSuite_compressdev_zlib_pmd.py
> @@ -54,10 +54,6 @@ class TestCompressdevZlibPmd(TestCase):
>          cc.default_opts = copy.deepcopy(self.opts)
>
>      def prepare_dpdk(self):
> -        self.dut.send_expect(
> -            "sed -i 's/CONFIG_RTE_COMPRESSDEV_TEST=n$/CONFIG_RTE_COMPRESSDEV_TEST=y/' config/common_base", "# ")
> -        self.dut.send_expect(
> -            "sed -i 's/CONFIG_RTE_LIBRTE_PMD_ZLIB=n$/CONFIG_RTE_LIBRTE_PMD_ZLIB=y/' config/common_base", "# ")
>          self.dut.build_install_dpdk(self.dut.target)
>
>      def test_zlib_pmd_unit_test(self):
> @@ -88,11 +84,6 @@ class TestCompressdevZlibPmd(TestCase):
>
>      def tear_down_all(self):
>          self.dut.kill_all()
> -
> -        self.dut.send_expect(
> -            "sed -i 's/CONFIG_RTE_COMPRESSDEV_TEST=y$/CONFIG_RTE_COMPRESSDEV_TEST=n/' config/common_base", "# ")
> -        self.dut.send_expect(
> -            "sed -i 's/CONFIG_RTE_LIBRTE_PMD_ZLIB=y$/CONFIG_RTE_LIBRTE_PMD_ZLIB=n/' config/common_base", "# ")
>          self.dut.build_install_dpdk(self.dut.target)
>
>          if not self._perf_result:
> diff --git a/tests/TestSuite_crypto_perf_cryptodev_perf.py b/tests/TestSuite_crypto_perf_cryptodev_perf.py
> index 759c5186..39be86c1 100644
> --- a/tests/TestSuite_crypto_perf_cryptodev_perf.py
> +++ b/tests/TestSuite_crypto_perf_cryptodev_perf.py
> @@ -86,13 +86,9 @@ class PerfTestsCryptodev(TestCase):
>              self.dut.session.copy_file_to(file, self.dut_file_dir)
>
>      def tear_down_all(self):
> -        cc.clear_dpdk_config(self)
> -
> -        if not self._perf_result:
> -            return
> -
> -        with open(self.logger.log_path + "/" + "perf_cryptodev_result.json", "a") as fv:
> -            json.dump(self._perf_result, fv, indent=4)
> +        if self._perf_result:
> +            with open(self.logger.log_path + "/" + "perf_cryptodev_result.json", "a") as fv:
> +                json.dump(self._perf_result, fv, indent=4)
>
>      def set_up(self):
>          pass
> diff --git a/tests/TestSuite_external_mempool_handler.py b/tests/TestSuite_external_mempool_handler.py
> index cee22d0f..d747a9da 100644
> --- a/tests/TestSuite_external_mempool_handler.py
> +++ b/tests/TestSuite_external_mempool_handler.py
> @@ -60,7 +60,6 @@ class TestExternalMempool(TestCase):
>          pass
>
>      def change_mempool_ops(self, ops=''):
> -        self.dut.send_expect("sed -i 's/CONFIG_RTE_MBUF_DEFAULT_MEMPOOL_OPS=.*$/CONFIG_RTE_MBUF_DEFAULT_MEMPOOL_OPS=\"%s\"/' ./config/common_base" % ops, "# ")
>          self.dut.set_build_options({'RTE_MBUF_DEFAULT_MEMPOOL_OPS': ops})

Mbuf mempool ops can be passed at runtime via --mbuf-pool-ops-name.
No need to recompile if DTS calls with the right option.


>          self.dut.build_install_dpdk(self.target)
>
> diff --git a/tests/TestSuite_fips_cryptodev.py b/tests/TestSuite_fips_cryptodev.py
> index 39b30c6a..8731b109 100644
> --- a/tests/TestSuite_fips_cryptodev.py
> +++ b/tests/TestSuite_fips_cryptodev.py
> @@ -43,8 +43,8 @@ class FipCryptodev(TestCase):
>          if not cc.is_build_skip(self):
>              cc.build_dpdk_with_cryptodev(self)
>          out = self.dut.build_dpdk_apps("./examples/fips_validation")
> -        self.verify("Error"not in out,"Compilation error")
> -        self.verify("No such"not in out,"Compilation error")
> +        self.verify("Error"not in out, "Compilation error")
> +        self.verify("No such"not in out, "Compilation error")
>          self.vf_driver = self.get_suite_cfg()['vf_driver']
>          cc.bind_qat_device(self, "vfio-pci")
>          self._app_path = self.dut.apps_name['fips_validation']
> @@ -54,7 +54,7 @@ class FipCryptodev(TestCase):
>              "cryptodev": None,
>              "path-is-folder": "",
>              "cryptodev-id": 0,
> -            "self-test":"",
> +            "self-test": "",
>          }
>          self.FIP_path = "/root/FIPS"
>
> @@ -65,7 +65,7 @@ class FipCryptodev(TestCase):
>          self.dut.kill_all()
>
>      def tear_down_all(self):
> -        cc.clear_dpdk_config(self)
> +        pass
>
>      # Private functions
>      def _get_fips_opt_str(self):
> @@ -86,14 +86,14 @@ class FipCryptodev(TestCase):
>      def compare_resp_file(self,eal_opt_str,fips_opt_str):
>          out = self._run_fips(eal_opt_str, fips_opt_str)
>          check_out = out[out.index("Done"):]
> -        self.verify("Error" not in check_out," req file error")
> +        self.verify("Error" not in check_out, " req file error")
>          rep_list = re.findall(r"FIPS/(.*)/req/(.*).req", out)
>
>          for alog_name, file_name in rep_list:
>              out = self.dut.send_expect("diff %s/%s/resp/%s.rsp %s/%s/fax/%s.rsp | grep -v '#' | grep -v '\---'" % (
>              self.FIP_path, alog_name, file_name, self.FIP_path, alog_name, file_name), "#")
>              lines = re.split('\r\n', out)
> -            self.verify(len(lines) <= 2, "%s.req file comparison failed!"%file_name)
> +            self.verify(len(lines) <= 2, "%s.req file comparison failed!" % file_name)
>
>      def test_fips_aesni_mb_aes(self):
>          eal_opt_str = cc.get_eal_opt_str(self)
> @@ -121,72 +121,72 @@ class FipCryptodev(TestCase):
>          self.compare_resp_file(eal_opt_str, fips_opt_str)
>
>      def test_fips_qat_gcm(self):
> -        eal_opt_str = cc.get_eal_opt_str(self,{"vdev":None})
> +        eal_opt_str = cc.get_eal_opt_str(self, {"vdev": None})
>          fips_opt_str = self._get_fips_opt_str()
>          self.compare_resp_file(eal_opt_str, fips_opt_str)
>
>      def test_fips_qat_aes(self):
> -        eal_opt_str = cc.get_eal_opt_str(self,{"vdev":None})
> +        eal_opt_str = cc.get_eal_opt_str(self, {"vdev": None})
>          fips_opt_str = self._get_fips_opt_str()
>          self.compare_resp_file(eal_opt_str, fips_opt_str)
>
>      def test_fips_qat_3des(self):
> -        eal_opt_str = cc.get_eal_opt_str(self,{"vdev":None})
> +        eal_opt_str = cc.get_eal_opt_str(self, {"vdev": None})
>          fips_opt_str = self._get_fips_opt_str()
>          self.compare_resp_file(eal_opt_str, fips_opt_str)
>
>      def test_fips_qat_hmac(self):
> -        eal_opt_str = cc.get_eal_opt_str(self,{"vdev":None})
> +        eal_opt_str = cc.get_eal_opt_str(self, {"vdev": None})
>          fips_opt_str = self._get_fips_opt_str()
>          self.compare_resp_file(eal_opt_str, fips_opt_str)
>
>      def test_fips_qat_ccm(self):
> -        eal_opt_str = cc.get_eal_opt_str(self,{"vdev":None})
> +        eal_opt_str = cc.get_eal_opt_str(self, {"vdev": None})
>          fips_opt_str = self._get_fips_opt_str()
>          self.compare_resp_file(eal_opt_str, fips_opt_str)
>
>      def test_fips_qat_cmac(self):
> -        eal_opt_str = cc.get_eal_opt_str(self,{"vdev":None})
> +        eal_opt_str = cc.get_eal_opt_str(self, {"vdev": None})
>          fips_opt_str = self._get_fips_opt_str()
>          self.compare_resp_file(eal_opt_str, fips_opt_str)
>
>      def test_fips_openssl_gcm(self):
> -        eal_opt_str = cc.get_eal_opt_str(self,{"vdev":"crypto_openssl_pmd_1"})
> +        eal_opt_str = cc.get_eal_opt_str(self, {"vdev": "crypto_openssl_pmd_1"})
>          fips_opt_str = self._get_fips_opt_str()
>          self.compare_resp_file(eal_opt_str, fips_opt_str)
>
>      def test_fips_openssl_aes(self):
> -        eal_opt_str = cc.get_eal_opt_str(self,{"vdev":"crypto_openssl_pmd_1"})
> +        eal_opt_str = cc.get_eal_opt_str(self, {"vdev": "crypto_openssl_pmd_1"})
>          fips_opt_str = self._get_fips_opt_str()
>          self.compare_resp_file(eal_opt_str, fips_opt_str)
>
>      def test_fips_openssl_3des(self):
> -        eal_opt_str = cc.get_eal_opt_str(self,{"vdev":"crypto_openssl_pmd_1"})
> +        eal_opt_str = cc.get_eal_opt_str(self, {"vdev": "crypto_openssl_pmd_1"})
>          fips_opt_str = self._get_fips_opt_str()
>          self.compare_resp_file(eal_opt_str, fips_opt_str)
>
>      def test_fips_openssl_hmac(self):
> -        eal_opt_str = cc.get_eal_opt_str(self,{"vdev":"crypto_openssl_pmd_1"})
> +        eal_opt_str = cc.get_eal_opt_str(self, {"vdev": "crypto_openssl_pmd_1"})
>          fips_opt_str = self._get_fips_opt_str()
>          self.compare_resp_file(eal_opt_str, fips_opt_str)
>
>      def test_fips_openssl_ccm(self):
> -        eal_opt_str = cc.get_eal_opt_str(self,{"vdev":"crypto_openssl_pmd_1"})
> +        eal_opt_str = cc.get_eal_opt_str(self, {"vdev": "crypto_openssl_pmd_1"})
>          fips_opt_str = self._get_fips_opt_str()
>          self.compare_resp_file(eal_opt_str, fips_opt_str)
>
>      def  test_fips_aesni_gcm_gcm(self):
> -        eal_opt_str = cc.get_eal_opt_str(self,{"vdev":"crypto_aesni_gcm_pmd_1"})
> +        eal_opt_str = cc.get_eal_opt_str(self, {"vdev": "crypto_aesni_gcm_pmd_1"})
>          fips_opt_str = self._get_fips_opt_str()
>          self.compare_resp_file(eal_opt_str, fips_opt_str)
>
>      def test_fips_self_test(self):
> -        eal_opt_str = cc.get_eal_opt_str(self,{"l":None,"n":None,})
> +        eal_opt_str = cc.get_eal_opt_str(self, {"l": None, "n": None})
>          fips_opt_str = self._get_fips_opt_str()
>          self.compare_resp_file(eal_opt_str, fips_opt_str)
>
>      def test_fips_broken_test(self):
> -        eal_opt_str = cc.get_eal_opt_str(self,{"l":None,"n":None,})
> -        fips_opt_str = cc.get_opt_str(self, self._default_fips_opts,{"cryptodev-id":None, "broken-test-id":15, "broken-test-dir":"dec"})
> +        eal_opt_str = cc.get_eal_opt_str(self, {"l": None, "n": None})
> +        fips_opt_str = cc.get_opt_str(self, self._default_fips_opts, {"cryptodev-id": None, "broken-test-id": 15, "broken-test-dir": "dec"})
>          out = self._run_fips(eal_opt_str, fips_opt_str)
>          self.verify("Failed init" in out, "test Failed!")
> diff --git a/tests/TestSuite_ieee1588.py b/tests/TestSuite_ieee1588.py
> index e17b1699..d61f2a53 100644
> --- a/tests/TestSuite_ieee1588.py
> +++ b/tests/TestSuite_ieee1588.py
> @@ -55,8 +55,6 @@ class TestIeee1588(TestCase):
>          self.verify(len(dutPorts) > 0, "No ports found for " + self.nic)
>
>          # Change the config file to support IEEE1588 and recompile the package.
> -        self.dut.send_expect(
> -            "sed -i -e 's/IEEE1588=n$/IEEE1588=y/' config/common_base", "# ", 30)
>          self.dut.set_build_options({'RTE_LIBRTE_IEEE1588': 'y'})
>          self.dut.skip_setup = False
>          self.dut.build_install_dpdk(self.target)
> @@ -173,7 +171,5 @@ class TestIeee1588(TestCase):
>          self.dut.send_expect("quit", "# ", 30)
>
>          # Restore the config file and recompile the package.
> -        self.dut.send_expect(
> -            "sed -i -e 's/IEEE1588=y$/IEEE1588=n/' config/common_base", "# ", 30)
>          self.dut.set_build_options({'RTE_LIBRTE_IEEE1588': 'n'})
>          self.dut.build_install_dpdk(self.target)
> diff --git a/tests/TestSuite_ipsec_gw_cryptodev_func.py b/tests/TestSuite_ipsec_gw_cryptodev_func.py
> index a5d6e775..bfdc1271 100644
> --- a/tests/TestSuite_ipsec_gw_cryptodev_func.py
> +++ b/tests/TestSuite_ipsec_gw_cryptodev_func.py
> @@ -97,7 +97,7 @@ class TestIPsecGW(TestCase):
>          self.dut.kill_all()
>
>      def tear_down_all(self):
> -        cc.clear_dpdk_config(self)
> +        pass
>
>      def test_qat_aes_128_cbc_ipv4_tunnel(self):
>          self._execute_ipsec_gw_test()
> diff --git a/tests/TestSuite_kni.py b/tests/TestSuite_kni.py
> index 85289d37..151668c3 100644
> --- a/tests/TestSuite_kni.py
> +++ b/tests/TestSuite_kni.py
> @@ -259,9 +259,6 @@ class TestKni(TestCase):
>          out = self.dut.send_expect("which brctl", "# ")
>          self.verify('no brctl' not in out,
>                      "The linux tool brctl is needed to run this test suite")
> -
> -        self.dut.send_expect("sed -i -e 's/KNI_KMOD_ETHTOOL=n$/KNI_KMOD_ETHTOOL=y/' config/common_base", "# ", 30)
> -        self.dut.send_expect("sed -i -e 's/CONFIG_RTE_KNI_KMOD=n$/CONFIG_RTE_KNI_KMOD=y/' config/common_base", "# ", 30)
>          self.dut.build_install_dpdk(self.target)
>
>          out = self.dut.build_dpdk_apps("./examples/kni")
> @@ -1225,9 +1222,6 @@ class TestKni(TestCase):
>          """
>          Run after each test suite.
>          """
> -
> -        self.dut.send_expect("sed -i -e 's/KNI_KMOD_ETHTOOL=y$/KNI_KMOD_ETHTOOL=n/' config/common_base", "# ", 30)
>          self.dut.build_install_dpdk(self.target)
> -
>          self.dut.kill_all()
>          self.dut.send_expect("rmmod rte_kni", "# ", 10)
> diff --git a/tests/TestSuite_l2fwd_cryptodev_func.py b/tests/TestSuite_l2fwd_cryptodev_func.py
> index 1e8ce549..1b9129af 100644
> --- a/tests/TestSuite_l2fwd_cryptodev_func.py
> +++ b/tests/TestSuite_l2fwd_cryptodev_func.py
> @@ -438,7 +438,7 @@ class TestL2fwdCrypto(TestCase):
>          self.dut.kill_all()
>
>      def tear_down_all(self):
> -        cc.clear_dpdk_config(self)
> +        pass
>
>      def __test_vector_to_cmd(self, test_vector, core_mask="", port_mask=""):
>          cores = ','.join(self.core_list)
> diff --git a/tests/TestSuite_packet_capture.py b/tests/TestSuite_packet_capture.py
> index 4440c5f3..5ad7ed37 100644
> --- a/tests/TestSuite_packet_capture.py
> +++ b/tests/TestSuite_packet_capture.py
> @@ -815,12 +815,7 @@ class TestPacketCapture(TestCase):
>             not self.is_existed_on_crb(self.pdump_log, crb='tester'):
>              cmd = "mkdir -p {0}".format(self.pdump_log)
>              self.tester.alt_session.send_expect(cmd, "# ")
> -        self.pcap_SW = "CONFIG_RTE_LIBRTE_PMD_PCAP"
> -        self.SW_file = os.path.join(self.target_dir, 'config/common_base')
>          if not (self.dut_skip_compile and self.check_pcap_lib()):
> -            cmd = "sed -i -e 's/{0}=n$/{0}=y/' {1}".format(
> -                self.pcap_SW, self.SW_file)
> -            self.dut.alt_session.send_expect(cmd, "# ", 30)
>              self.dut.skip_setup = False
>              self.dut.build_install_dpdk(self.target)
>          # secondary process (dpdk-pdump)
> @@ -879,10 +874,6 @@ class TestPacketCapture(TestCase):
>              self.session_ex = None
>          # Restore the config file and recompile the package.
>          if self.check_pcap_lib():
> -            self.dut.alt_session.send_expect(
> -                ("sed -i -e 's/{0}=y$/{0}=n/' "
> -                 "{1}").format(self.pcap_SW, self.SW_file),
> -                "# ", 120)
>              # temporary disable skip_setup
>              skip_setup = self.dut.skip_setup
>              self.dut.skip_setup = True
> diff --git a/tests/TestSuite_pmd.py b/tests/TestSuite_pmd.py
> index 52250023..98421765 100644
> --- a/tests/TestSuite_pmd.py
> +++ b/tests/TestSuite_pmd.py
> @@ -75,7 +75,6 @@ class TestPmd(TestCase):
>          self.blocklist = ""
>
>          # Update config file and rebuild to get best perf on FVL
> -        self.dut.send_expect("sed -i -e 's/CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=n/CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=y/' ./config/common_base", "#", 20)
>          self.dut.build_install_dpdk(self.target)
>
>          # Based on h/w type, choose how many ports to use
> diff --git a/tests/TestSuite_power_branch_ratio.py b/tests/TestSuite_power_branch_ratio.py
> index dee2cc11..7484d130 100644
> --- a/tests/TestSuite_power_branch_ratio.py
> +++ b/tests/TestSuite_power_branch_ratio.py
> @@ -44,8 +44,7 @@ from pprint import pformat
>  from framework.exception import VerifyFailure
>  from framework.packet import Packet
>  from framework.pktgen import TRANSMIT_CONT
> -from framework.qemu_libvirt import LibvirtKvm
> -from framework.settings import HEADER_SIZE, HOST_BUILD_TYPE_SETTING, load_global_setting
> +from framework.settings import HEADER_SIZE
>  from framework.test_case import TestCase
>  from framework.utils import create_mask as dts_create_mask
>
> @@ -224,15 +223,8 @@ class TestPowerBranchRatio(TestCase):
>          return sw_table
>
>      def preset_compilation(self):
> -        if 'meson' == load_global_setting(HOST_BUILD_TYPE_SETTING):
> -            compile_SWs = self.compile_switch + ["CONFIG_RTE_LIBRTE_I40E_PMD"]
> -            self.dut.set_build_options(dict([(sw[7:], 'y') for sw in compile_SWs]))
> -        else:
> -            for sw in self.compile_switch:
> -                cmd = ("sed -i -e "
> -                       "'s/{0}=n$/{0}=y/' "
> -                       "{1}/config/common_base").format(sw, self.target_dir)
> -                self.d_a_con(cmd)
> +        compile_SWs = self.compile_switch + ["CONFIG_RTE_LIBRTE_I40E_PMD"]

This option does not exist anymore.
So I don't think this code has any effect.


> +        self.dut.set_build_options(dict([(sw[7:], 'y') for sw in compile_SWs]))
>          # re-compile dpdk source code
>          self.dut.build_install_dpdk(self.target)
>
> @@ -247,15 +239,8 @@ class TestPowerBranchRatio(TestCase):
>              except Exception as e:
>                  self.logger.error(traceback.format_exc())
>              # restore compilation
> -            if 'meson' == load_global_setting(HOST_BUILD_TYPE_SETTING):
> -                self.dut.set_build_options(
> -                    dict([(sw[7:], 'n') for sw in self.compile_switch]))
> -            else:
> -                for sw in self.compile_switch:
> -                    cmd = ("sed -i -e "
> -                           "'s/{0}=y$/{0}=n/' "
> -                           "{1}/config/common_base").format(sw, self.target_dir)
> -                    self.d_a_con(cmd)
> +            self.dut.set_build_options(
> +                dict([(sw[7:], 'n') for sw in self.compile_switch]))
>              # re-compile dpdk source code
>              self.dut.build_install_dpdk(self.target)
>
> diff --git a/tests/TestSuite_power_pbf.py b/tests/TestSuite_power_pbf.py
> index 42d939cd..832f5c57 100644
> --- a/tests/TestSuite_power_pbf.py
> +++ b/tests/TestSuite_power_pbf.py
> @@ -31,18 +31,14 @@
>
>  import json
>  import os
> -import random
>  import re
>  import shutil
>  import time
>  import traceback
> +
>  from collections import Counter
>  from pprint import pformat
> -
>  from framework.exception import VerifyFailure
> -
> -# import framework.dts as dts libs
> -from framework.settings import HOST_BUILD_TYPE_SETTING, load_global_setting
>  from framework.test_case import TestCase
>  from framework.utils import create_mask
>
> @@ -149,12 +145,7 @@ class TestPowerPbf(TestCase):
>          self.create_powermonitor_folder()
>          # open debug SW
>          SW = "CONFIG_RTE_LIBRTE_POWER_DEBUG"
> -        if 'meson' == load_global_setting(HOST_BUILD_TYPE_SETTING):
> -            self.dut.set_build_options({SW[7:]: 'y'})
> -        else:
> -            cmd = "sed -i -e 's/{0}=n$/{0}=y/' {1}/config/common_base".format(
> -                SW, self.target_dir)
> -            self.d_a_con(cmd)
> +        self.dut.set_build_options({SW[7:]: 'y'})
>          self.dut.build_install_dpdk(self.target)
>          # set up vm power management binary process setting
>          self.vm_power_mgr = self.prepare_binary('vm_power_manager')
> diff --git a/tests/TestSuite_power_telemetry.py b/tests/TestSuite_power_telemetry.py
> index d8182ce2..dda942a4 100644
> --- a/tests/TestSuite_power_telemetry.py
> +++ b/tests/TestSuite_power_telemetry.py
> @@ -45,7 +45,7 @@ from pprint import pformat
>  from framework.exception import VerifyFailure
>  from framework.packet import Packet
>  from framework.pktgen import TRANSMIT_CONT
> -from framework.settings import HEADER_SIZE, HOST_BUILD_TYPE_SETTING, load_global_setting
> +from framework.settings import HEADER_SIZE
>  from framework.test_case import TestCase
>  from framework.utils import create_mask as dts_create_mask
>
> @@ -122,17 +122,11 @@ class TestPowerTelemetry(TestCase):
>          return result
>
>      def preset_compilation(self):
> -        if self.dut.skip_setup:
> -            return
> -        SW = "CONFIG_RTE_LIBRTE_TELEMETRY"
> -        if 'meson' == load_global_setting(HOST_BUILD_TYPE_SETTING):
> +        if not self.dut.skip_setup:
> +            SW = "CONFIG_RTE_LIBRTE_TELEMETRY"

Telemetry is built by default, plus this config option with _LIBRTE_
does not exist anymore.


>              self.dut.set_build_options({SW[7:]: 'y'})
> -        else:
> -            cmd = "sed -i -e 's/{0}=n$/{0}=y/' {1}/config/common_base".format(
> -                SW, self.target_dir)
> -            self.d_a_con(cmd)
> -        # re-compile dpdk source code
> -        self.dut.build_install_dpdk(self.target)
> +            # re-compile dpdk source code
> +            self.dut.build_install_dpdk(self.target)
>
>      def prepare_binary(self, name):
>          example_dir = "examples/" + name
> diff --git a/tests/TestSuite_unit_tests_cryptodev_func.py b/tests/TestSuite_unit_tests_cryptodev_func.py
> index d2117255..02d1b092 100644
> --- a/tests/TestSuite_unit_tests_cryptodev_func.py
> +++ b/tests/TestSuite_unit_tests_cryptodev_func.py
> @@ -51,7 +51,7 @@ class UnitTestsCryptodev(TestCase):
>          self.dut.kill_all()
>
>      def tear_down_all(self):
> -        cc.clear_dpdk_config(self)
> +        pass
>
>      def _get_crypto_device(self, num):
>          device = {}
> diff --git a/tests/TestSuite_unit_tests_kni.py b/tests/TestSuite_unit_tests_kni.py
> index 5ad19d15..91283b8a 100644
> --- a/tests/TestSuite_unit_tests_kni.py
> +++ b/tests/TestSuite_unit_tests_kni.py
> @@ -73,8 +73,6 @@ class TestUnitTestsKni(TestCase):
>
>          KNI Prerequisites
>          """
> -        self.dut.send_expect("sed -i -e 's/KNI_KMOD_ETHTOOL=n$/KNI_KMOD_ETHTOOL=y/' config/common_base", "# ", 30)
> -        self.dut.send_expect("sed -i -e 's/CONFIG_RTE_KNI_KMOD=n$/CONFIG_RTE_KNI_KMOD=y/' config/common_base", "# ", 30)
>          self.dut.set_build_options({'KNI_KMOD_ETHTOOL': 'y'})

ethtool support was dropped ages ago (19.08?).

>          self.dut.set_build_options({'RTE_KNI_KMOD': 'y'})

Kernel modules are built via meson option enable_kmods.


>          self.dut.build_install_dpdk(self.target)
> diff --git a/tests/TestSuite_vhost_1024_ethports.py b/tests/TestSuite_vhost_1024_ethports.py
> index 3b20f3e0..d2a643c2 100644
> --- a/tests/TestSuite_vhost_1024_ethports.py
> +++ b/tests/TestSuite_vhost_1024_ethports.py
> @@ -65,18 +65,10 @@ class TestVhost1024Ethports(TestCase):
>          self.vhost_user = self.dut.new_session(suite='vhost-user')
>
>      def build_user_dpdk(self):
> -        if self.dut.build_type == "meson":
> -            self.dut.build_install_dpdk(self.target, extra_options="-Dmax_ethports=1024")
> -        else:
> -            self.dut.send_expect("sed -i 's/CONFIG_RTE_MAX_ETHPORTS=32$/CONFIG_RTE_MAX_ETHPORTS=1024/' config/common_base", '#', 30)
> -            self.dut.build_install_dpdk(self.target)
> +        self.dut.build_install_dpdk(self.target, extra_options="-Dmax_ethports=1024")
>
>      def restore_dpdk(self):
> -        if self.dut.build_type == "meson":
> -            self.dut.build_install_dpdk(self.target, extra_options="-Dmax_ethports=32")
> -        else:
> -            self.dut.send_expect("sed -i 's/CONFIG_RTE_MAX_ETHPORTS=1024$/CONFIG_RTE_MAX_ETHPORTS=32/' config/common_base", '#', 30)
> -            self.dut.build_install_dpdk(self.target)
> +        self.dut.build_install_dpdk(self.target, extra_options="-Dmax_ethports=32")
>
>      @property
>      def check_2M_env(self):
> diff --git a/tests/TestSuite_virtio_ipsec_cryptodev_func.py b/tests/TestSuite_virtio_ipsec_cryptodev_func.py
> index c4f62b86..d5374209 100644
> --- a/tests/TestSuite_virtio_ipsec_cryptodev_func.py
> +++ b/tests/TestSuite_virtio_ipsec_cryptodev_func.py
> @@ -96,10 +96,6 @@ class VirtioCryptodevIpsecTest(TestCase):
>          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)
>          user_dut.set_build_options({'RTE_LIBRTE_PMD_AESNI_MB': 'y'})

Same comment as above, this config option does not exist anymore, it
has no effect.


>          user_dut.build_install_dpdk(self.target)
>          user_dut.build_dpdk_apps("./examples/ipsec-secgw")
> @@ -371,5 +367,3 @@ class VirtioCryptodevIpsecTest(TestCase):
>          self.dut.send_expect("killall -s INT %s" % self.app_name, "#")
>          self.dut_execut_cmd("killall -s INT qemu-system-x86_64")
>          self.dut_execut_cmd("rm -r /tmp/*")
> -
> -        cc.clear_dpdk_config(self)
> diff --git a/tests/TestSuite_virtio_perf_cryptodev_func.py b/tests/TestSuite_virtio_perf_cryptodev_func.py
> index 92765675..f8b288c8 100644
> --- a/tests/TestSuite_virtio_perf_cryptodev_func.py
> +++ b/tests/TestSuite_virtio_perf_cryptodev_func.py
> @@ -117,10 +117,6 @@ class VirtioCryptodevPerfTest(TestCase):
>          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)
>          user_dut.set_build_options({'RTE_LIBRTE_PMD_AESNI_MB': 'y'})
>          user_dut.build_install_dpdk(self.target)
>
> @@ -257,4 +253,3 @@ class VirtioCryptodevPerfTest(TestCase):
>          self.dut.send_expect("killall -s INT %s" % self.app_name, "#")
>          self.dut_execut_cmd("killall -s INT qemu-system-x86_64")
>          self.dut_execut_cmd("rm -r /tmp/*")
> -        cc.clear_dpdk_config(self)
> diff --git a/tests/TestSuite_virtio_unit_cryptodev_func.py b/tests/TestSuite_virtio_unit_cryptodev_func.py
> index 6ccfef7f..fd5b30fe 100644
> --- a/tests/TestSuite_virtio_unit_cryptodev_func.py
> +++ b/tests/TestSuite_virtio_unit_cryptodev_func.py
> @@ -202,5 +202,3 @@ class VirtioCryptodevUnitTest(TestCase):
>          self.dut.send_expect("killall -s INT %s" % self.app_name, "#")
>          self.dut_execut_cmd("killall -s INT qemu-system-x86_64")
>          self.dut_execut_cmd("rm -r /tmp/*")
> -
> -        cc.clear_dpdk_config(self)
> diff --git a/tests/TestSuite_vmdq_dcb.py b/tests/TestSuite_vmdq_dcb.py
> index b5714469..c7f60141 100644
> --- a/tests/TestSuite_vmdq_dcb.py
> +++ b/tests/TestSuite_vmdq_dcb.py
> @@ -93,8 +93,6 @@ class TestVmdqDcb(TestCase):
>          """
>          Rebuild dpdk
>          """
> -        self.dut.send_expect("sed -i -e 's/CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM=.*$/CONFIG_RTE_LIBRTE_I40E_"
> -                             "QUEUE_NUM_PER_VM=%s/' ./config/common_base" % nb_queue_per_vm, "#", 20)
>          self.dut.set_build_options({'RTE_LIBRTE_I40E_QUEUE_NUM_PER_VM': nb_queue_per_vm})
>          self.dut.build_install_dpdk(self.target)
>
> diff --git a/tests/cryptodev_common.py b/tests/cryptodev_common.py
> index e3c58cdc..2856e322 100644
> --- a/tests/cryptodev_common.py
> +++ b/tests/cryptodev_common.py
> @@ -74,43 +74,20 @@ def build_dpdk_with_cryptodev(test_case):
>      test_case.dut.send_expect(
>          "export LD_LIBRARY_PATH={}".format(fip_library_path), "#")
>
> -    test_case.dut.send_expect(
> -        "sed -i 's/CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n$/CONFIG_RTE_LIBRTE_PMD_AESNI_MB=y/' config/common_base", "# ")
>      test_case.dut.set_build_options({'RTE_LIBRTE_PMD_AESNI_MB': 'y'})
> -
> -    test_case.dut.send_expect(
> -        "sed -i 's/CONFIG_RTE_LIBRTE_PMD_QAT_SYM=n$/CONFIG_RTE_LIBRTE_PMD_QAT_SYM=y/' config/common_base", "# ")
>      test_case.dut.set_build_options({'RTE_LIBRTE_PMD_QAT_SYM': 'y'})
> -
> -    test_case.dut.send_expect(
> -        "sed -i 's/CONFIG_RTE_LIBRTE_PMD_QAT_ASYM=n$/CONFIG_RTE_LIBRTE_PMD_QAT_ASYM=y/' config/common_base", "# ")
>      test_case.dut.set_build_options({'RTE_LIBRTE_PMD_QAT_ASYM': 'y'})
> -
> -    test_case.dut.send_expect(
> -        "sed -i 's/CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=n$/CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=y/' config/common_base", "# ")
>      test_case.dut.set_build_options({'RTE_LIBRTE_PMD_AESNI_GCM': 'y'})
> -
> -    test_case.dut.send_expect(
> -        "sed -i 's/CONFIG_RTE_LIBRTE_PMD_OPENSSL=n$/CONFIG_RTE_LIBRTE_PMD_OPENSSL=y/' config/common_base", "# ")
>      test_case.dut.set_build_options({'RTE_LIBRTE_PMD_OPENSSL': 'y'})
> -
> -    test_case.dut.send_expect(
> -        "sed -i 's/CONFIG_RTE_LIBRTE_PMD_SNOW3G=n$/CONFIG_RTE_LIBRTE_PMD_SNOW3G=y/' config/common_base", "# ")
>      test_case.dut.set_build_options({'RTE_LIBRTE_PMD_SNOW3G': 'y'})
> -
> -    test_case.dut.send_expect(
> -        "sed -i 's/CONFIG_RTE_LIBRTE_PMD_KASUMI=n$/CONFIG_RTE_LIBRTE_PMD_KASUMI=y/' config/common_base", "# ")
>      test_case.dut.set_build_options({'RTE_LIBRTE_PMD_KASUMI': 'y'})
> -
> -    test_case.dut.send_expect(
> -        "sed -i 's/CONFIG_RTE_LIBRTE_PMD_ZUC=n$/CONFIG_RTE_LIBRTE_PMD_ZUC=y/' config/common_base", "# ")
>      test_case.dut.set_build_options({'RTE_LIBRTE_PMD_ZUC': 'y'})

Setting all those options above probably has no effect.


>
>      test_case.dut.skip_setup = False
>      test_case.dut.build_install_dpdk(test_case.dut.target)
>
>
> -def bind_qat_device(test_case, driver = "igb_uio"):
> +def bind_qat_device(test_case, driver="igb_uio"):
>      if driver == 'vfio-pci':
>          test_case.dut.send_expect('modprobe vfio', '#', 10)
>          test_case.dut.send_expect('modprobe vfio-pci', '#', 10)
> @@ -168,25 +145,6 @@ def get_qat_devices(test_case, cpm_num=None, num=1):
>      return dev_list
>
>
> -def clear_dpdk_config(test_case):
> -    test_case.dut.send_expect(
> -        "sed -i 's/CONFIG_RTE_LIBRTE_PMD_AESNI_MB=y$/CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n/' config/common_base", "# ")
> -    test_case.dut.send_expect(
> -        "sed -i 's/CONFIG_RTE_LIBRTE_PMD_QAT_SYM=y$/CONFIG_RTE_LIBRTE_PMD_QAT_SYM=n/' config/common_base", "# ")
> -    test_case.dut.send_expect(
> -        "sed -i 's/CONFIG_RTE_LIBRTE_PMD_QAT_ASYM=y$/CONFIG_RTE_LIBRTE_PMD_QAT_ASYM=n/' config/common_base", "# ")
> -    test_case.dut.send_expect(
> -        "sed -i 's/CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=y$/CONFIG_RTE_LIBRTE_PMD_AESNI_GCM=n/' config/common_base", "# ")
> -    test_case.dut.send_expect(
> -        "sed -i 's/CONFIG_RTE_LIBRTE_PMD_OPENSSL=y$/CONFIG_RTE_LIBRTE_PMD_OPENSSL=n/' config/common_base", "# ")
> -    test_case.dut.send_expect(
> -        "sed -i 's/CONFIG_RTE_LIBRTE_PMD_SNOW3G=y$/CONFIG_RTE_LIBRTE_PMD_SNOW3G=n/' config/common_base", "# ")
> -    test_case.dut.send_expect(
> -        "sed -i 's/CONFIG_RTE_LIBRTE_PMD_KASUMI=y$/CONFIG_RTE_LIBRTE_PMD_KASUMI=n/' config/common_base", "# ")
> -    test_case.dut.send_expect(
> -        "sed -i 's/CONFIG_RTE_LIBRTE_PMD_ZUC=y$/CONFIG_RTE_LIBRTE_PMD_ZUC=n/' config/common_base", "# ")
> -
> -
>  default_eal_opts = {
>      "c": None,
>      "l": None,
> --
> 2.33.1.windows.1
>


-- 
David Marchand


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2021-11-18  8:23 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-17  8:54 [dts] [PATCH V1 1/4] executions/execution*: removed makefile from configure file DongJunX
2021-11-17  8:54 ` [dts] [PATCH V1 2/4] doc/dts_gsg: removed makefile from user guide document DongJunX
2021-11-17  8:54 ` [dts] [PATCH V1 3/4] framework/*: removed makefile from framework DongJunX
2021-11-17  8:54 ` [dts] [PATCH V1 4/4] tests/*: removed makefile from test suite DongJunX
2021-11-18  8:23   ` David Marchand

test suite reviews and discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://inbox.dpdk.org/dts/0 dts/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dts dts/ http://inbox.dpdk.org/dts \
		dts@dpdk.org
	public-inbox-index dts

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.dts


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git