* [dts] [V2 0/4] removed makefile relation content
@ 2022-02-25 5:43 Jun Dong
2022-02-25 5:43 ` [dts] [V2 1/4] executions/execution*: removed makefile from configure Jun Dong
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Jun Dong @ 2022-02-25 5:43 UTC (permalink / raw)
To: dts; +Cc: lijuan.tu, qingx.sun, junx.dong
*** BLURB HERE ***
Makefile builds have been deprecated, so
removd relation content out from framework.
Jun Dong (4):
executions/execution*: removed makefile from configure
doc/dts_gsg: removed makefile from user guide document
framework/*: removed makefile from framework
tests/*: removed makefile from test suite
conf/app_name.cfg | 61 +------
doc/dts_gsg/usr_guide/usage.rst | 2 +-
executions/execution.cfg | 4 +-
executions/execution_FVL.cfg | 4 +-
executions/execution_fm10k.cfg | 4 +-
executions/execution_rxmode.cfg | 6 +-
executions/execution_smoke.cfg | 2 +-
framework/dts.py | 12 --
framework/dut.py | 4 +-
framework/project_dpdk.py | 157 ++----------------
framework/settings.py | 1 -
framework/virt_dut.py | 7 +-
tests/TestSuite_compressdev_isal_pmd.py | 21 +--
tests/TestSuite_compressdev_qat_pmd.py | 20 +--
tests/TestSuite_compressdev_zlib_pmd.py | 22 +--
tests/TestSuite_crypto_perf_cryptodev_perf.py | 10 +-
tests/TestSuite_fips_cryptodev.py | 2 +-
tests/TestSuite_ieee1588.py | 4 -
tests/TestSuite_ipsec_gw_cryptodev_func.py | 2 +-
tests/TestSuite_kni.py | 8 -
tests/TestSuite_l2fwd_cryptodev_func.py | 2 +-
tests/TestSuite_packet_capture.py | 21 ---
tests/TestSuite_pmd.py | 4 -
tests/TestSuite_power_pbf.py | 12 +-
tests/TestSuite_unit_tests_cryptodev_func.py | 2 +-
tests/TestSuite_vhost_1024_ethports.py | 12 +-
tests/TestSuite_virtio_perf_cryptodev_func.py | 11 --
tests/TestSuite_virtio_unit_cryptodev_func.py | 2 -
tests/TestSuite_vmdq_dcb.py | 2 -
29 files changed, 52 insertions(+), 369 deletions(-)
--
2.33.1.windows.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* [dts] [V2 1/4] executions/execution*: removed makefile from configure
2022-02-25 5:43 [dts] [V2 0/4] removed makefile relation content Jun Dong
@ 2022-02-25 5:43 ` Jun Dong
2022-02-25 5:43 ` [dts] [V2 2/4] doc/dts_gsg: removed makefile from user guide document Jun Dong
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Jun Dong @ 2022-02-25 5:43 UTC (permalink / raw)
To: dts; +Cc: lijuan.tu, qingx.sun, junx.dong
Makefile builds have been deprecated, so:
- remove makefile option from build type list.
- remove makefile app list.
Signed-off-by: Jun Dong <junx.dong@intel.com>
---
conf/app_name.cfg | 61 ++-------------------------------
executions/execution.cfg | 4 +--
executions/execution_FVL.cfg | 4 +--
executions/execution_fm10k.cfg | 4 +--
executions/execution_rxmode.cfg | 6 ++--
executions/execution_smoke.cfg | 2 +-
6 files changed, 12 insertions(+), 69 deletions(-)
diff --git a/conf/app_name.cfg b/conf/app_name.cfg
index 01c4971b..5d3244da 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'
@@ -68,61 +68,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
-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..73ff0be2 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,
@@ -37,7 +37,7 @@ parameters=nic_type=cfg:func=true
[Execution2]
crbs=<Performance CRB IP Address>
drivername=<driver name igb_uio or vfio-pci>
-build_type=<makefile or meson>
+build_type=<meson>
test_suites=
l2fwd,
l3fwd,
diff --git a/executions/execution_FVL.cfg b/executions/execution_FVL.cfg
index b1cc02d1..8a71bbea 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,
@@ -38,7 +38,7 @@ parameters=nic_type=cfg:func=true
[Execution2]
crbs=<Performance CRB IP Address>
drivername=<driver name igb_uio or vfio-pci>
-build_type=<makefile or meson>
+build_type=<meson>
test_suites=
l2fwd,
l3fwd,
diff --git a/executions/execution_fm10k.cfg b/executions/execution_fm10k.cfg
index 414e7131..b535d78f 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,
@@ -21,7 +21,7 @@ parameters=nic_type=cfg:func=true
[Execution2]
crbs=<Performance CRB IP Address>
drivername=<driver name igb_uio or vfio-pci>
-build_type=<makefile or meson>
+build_type=<meson>
test_suites=
l3fwd,
targets=
diff --git a/executions/execution_rxmode.cfg b/executions/execution_rxmode.cfg
index d8feb535..041755e2 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,
@@ -25,7 +25,7 @@ parameters=nic_type=cfg:func=true
crbs=<CRB IP Address>
drivername=igb_uio
rx_mode=full
-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] 6+ messages in thread
* [dts] [V2 2/4] doc/dts_gsg: removed makefile from user guide document
2022-02-25 5:43 [dts] [V2 0/4] removed makefile relation content Jun Dong
2022-02-25 5:43 ` [dts] [V2 1/4] executions/execution*: removed makefile from configure Jun Dong
@ 2022-02-25 5:43 ` Jun Dong
2022-02-25 5:43 ` [dts] [V2 3/4] framework/*: removed makefile from framework Jun Dong
2022-02-25 5:43 ` [dts] [V2 4/4] tests/*: removed makefile from test suite Jun Dong
3 siblings, 0 replies; 6+ messages in thread
From: Jun Dong @ 2022-02-25 5:43 UTC (permalink / raw)
To: dts; +Cc: lijuan.tu, qingx.sun, junx.dong
Makefile builds have been deprecated, so:
- remove makefile relation description from user guide document.
Signed-off-by: Jun Dong <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 391662f6..ba714703 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 $DTS_CFG_FOLDER/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] 6+ messages in thread
* [dts] [V2 3/4] framework/*: removed makefile from framework
2022-02-25 5:43 [dts] [V2 0/4] removed makefile relation content Jun Dong
2022-02-25 5:43 ` [dts] [V2 1/4] executions/execution*: removed makefile from configure Jun Dong
2022-02-25 5:43 ` [dts] [V2 2/4] doc/dts_gsg: removed makefile from user guide document Jun Dong
@ 2022-02-25 5:43 ` Jun Dong
2022-02-25 5:43 ` [dts] [V2 4/4] tests/*: removed makefile from test suite Jun Dong
3 siblings, 0 replies; 6+ messages in thread
From: Jun Dong @ 2022-02-25 5:43 UTC (permalink / raw)
To: dts; +Cc: lijuan.tu, qingx.sun, junx.dong
Makefile builds have been deprecated, so:
- Removed makefile handle codes.
- Update context code structure after removed makefile relation codes.
Signed-off-by: Jun Dong <junx.dong@intel.com>
---
framework/dts.py | 12 ---
framework/dut.py | 4 +-
framework/project_dpdk.py | 157 +++++---------------------------------
framework/settings.py | 1 -
framework/virt_dut.py | 7 +-
5 files changed, 19 insertions(+), 162 deletions(-)
diff --git a/framework/dts.py b/framework/dts.py
index 1baddb84..ca6bb322 100644
--- a/framework/dts.py
+++ b/framework/dts.py
@@ -95,18 +95,6 @@ def dts_parse_param(config, section, log_handler):
parameters = config.get(section, 'parameters').split(':')
drivername = config.get(section, 'drivername').split('=')[-1]
- # get the build method, default is meson
- try:
- buildtype = config.get(section, 'build_type').split('=')[-1]
- except:
- buildtype = 'meson'
-
- if buildtype == 'makefile':
- log_handler.warning("Makefile builds have been deprecated and will be removed in the next release.")
- log_handler.warning("Please switch to using meson builds.")
-
- buildtype = buildtype.lower()
- settings.save_global_setting(settings.HOST_BUILD_TYPE_SETTING, buildtype)
driver = drivername.split(':')
if len(driver) == 2:
diff --git a/framework/dut.py b/framework/dut.py
index 2a4d8f3b..321a652b 100644
--- a/framework/dut.py
+++ b/framework/dut.py
@@ -238,9 +238,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 fc004e45..f6cf6aa6 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,
@@ -72,10 +71,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)
@@ -89,7 +84,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)
@@ -198,60 +193,23 @@ 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(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), "# ")
+ self.set_build_options_meson(config_parms, config_file)
def set_build_options_meson(self, config_parms, config_file=''):
"""
@@ -284,13 +242,12 @@ class DPDKdut(Dut):
Build DPDK source code with specified target.
"""
use_shared_lib = load_global_setting(HOST_SHARED_LIB_SETTING)
- shared_lib_path = load_global_setting(HOST_SHARED_LIB_PATH)
if use_shared_lib == 'true' and 'Virt' not in str(self):
self.set_build_options({'RTE_BUILD_SHARED_LIB': 'y'})
-
- 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(target, extra_options)
+ if self.get_os_type() == 'linux':
+ self.build_install_dpdk_linux_meson(target, extra_options)
+ elif self.get_os_type() == 'freebsd':
+ self.build_install_dpdk_freebsd_meson(target, extra_options)
def build_install_dpdk_linux_meson(self, target, extra_options):
"""
@@ -339,32 +296,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)
@@ -375,29 +306,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
@@ -528,9 +436,10 @@ 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))
- return build_dpdk_apps(folder, extra_options)
+ if self.get_os_type() == 'linux':
+ return self.build_dpdk_apps_linux_meson(folder, extra_options)
+ elif self.get_os_type() == 'freebsd':
+ return self.build_dpdk_apps_freebsd_meson(folder, extra_options)
def build_dpdk_apps_linux_meson(self, folder, extra_options):
"""
@@ -581,37 +490,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.
@@ -647,12 +529,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 7164c522..003c1d05 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,
@@ -231,11 +230,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] 6+ messages in thread
* [dts] [V2 4/4] tests/*: removed makefile from test suite
2022-02-25 5:43 [dts] [V2 0/4] removed makefile relation content Jun Dong
` (2 preceding siblings ...)
2022-02-25 5:43 ` [dts] [V2 3/4] framework/*: removed makefile from framework Jun Dong
@ 2022-02-25 5:43 ` Jun Dong
2022-02-27 14:27 ` Tu, Lijuan
3 siblings, 1 reply; 6+ messages in thread
From: Jun Dong @ 2022-02-25 5:43 UTC (permalink / raw)
To: dts; +Cc: lijuan.tu, qingx.sun, junx.dong
Makefile builds have been deprecated, so:
- Removed makefile handle codes.
- Update context code structure after removed makefile relation codes.
Signed-off-by: Jun Dong <junx.dong@intel.com>
---
tests/TestSuite_compressdev_isal_pmd.py | 21 +++---------------
tests/TestSuite_compressdev_qat_pmd.py | 20 +++--------------
tests/TestSuite_compressdev_zlib_pmd.py | 22 +++----------------
tests/TestSuite_crypto_perf_cryptodev_perf.py | 10 +++------
tests/TestSuite_fips_cryptodev.py | 2 +-
tests/TestSuite_ieee1588.py | 4 ----
tests/TestSuite_ipsec_gw_cryptodev_func.py | 2 +-
tests/TestSuite_kni.py | 8 -------
tests/TestSuite_l2fwd_cryptodev_func.py | 2 +-
tests/TestSuite_packet_capture.py | 21 ------------------
tests/TestSuite_pmd.py | 4 ----
tests/TestSuite_power_pbf.py | 12 ++--------
tests/TestSuite_unit_tests_cryptodev_func.py | 2 +-
tests/TestSuite_vhost_1024_ethports.py | 12 ++--------
tests/TestSuite_virtio_perf_cryptodev_func.py | 11 ----------
tests/TestSuite_virtio_unit_cryptodev_func.py | 2 --
tests/TestSuite_vmdq_dcb.py | 2 --
17 files changed, 20 insertions(+), 137 deletions(-)
diff --git a/tests/TestSuite_compressdev_isal_pmd.py b/tests/TestSuite_compressdev_isal_pmd.py
index 559c68de..3afde406 100644
--- a/tests/TestSuite_compressdev_isal_pmd.py
+++ b/tests/TestSuite_compressdev_isal_pmd.py
@@ -41,7 +41,6 @@ from framework.test_case import TestCase
class TestCompressdevIsalPmd(TestCase):
def set_up_all(self):
- self.prepare_dpdk()
cc.default_eals.update({'a': "0000:00:00.0", "vdev": "compress_isal"})
cc.default_opts.update({"driver-name": "compress_isal"})
self._perf_result = dict()
@@ -52,13 +51,6 @@ class TestCompressdevIsalPmd(TestCase):
cc.default_eals = copy.deepcopy(self.eals)
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):
cc.run_unit(self)
@@ -87,14 +79,7 @@ class TestCompressdevIsalPmd(TestCase):
def tear_down_all(self):
self.dut.kill_all()
+ if self._perf_result:
+ with open(self.logger.log_path + "/" + self.suite_name + ".json", "a") as f:
+ json.dump(self._perf_result, f, indent=4)
- 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:
- return
- with open(self.logger.log_path + "/" + self.suite_name + ".json", "a") as f:
- json.dump(self._perf_result, f, indent=4)
diff --git a/tests/TestSuite_compressdev_qat_pmd.py b/tests/TestSuite_compressdev_qat_pmd.py
index 38f0bff3..5865648d 100644
--- a/tests/TestSuite_compressdev_qat_pmd.py
+++ b/tests/TestSuite_compressdev_qat_pmd.py
@@ -41,7 +41,6 @@ from framework.test_case import TestCase
class TestCompressdevQatPmd(TestCase):
def set_up_all(self):
- self.prepare_dpdk()
cc.bind_qat_device(self, self.drivername)
cc.default_eals.update({"vdev": None})
cc.default_opts.update({"driver-name": "compress_qat"})
@@ -54,11 +53,6 @@ class TestCompressdevQatPmd(TestCase):
cc.default_eals = copy.deepcopy(self.eals)
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):
perf_device_list = []
for each in self.device_list:
@@ -153,14 +147,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:
- return
- with open(self.logger.log_path + "/" + self.suite_name + ".json", "a") as fv:
- json.dump(self._perf_result, fv, indent=4)
+ if self._perf_result:
+ with open(self.logger.log_path + "/" + self.suite_name + ".json", "a") as fv:
+ json.dump(self._perf_result, fv, indent=4)
diff --git a/tests/TestSuite_compressdev_zlib_pmd.py b/tests/TestSuite_compressdev_zlib_pmd.py
index f1b3d4c4..ce71e58b 100644
--- a/tests/TestSuite_compressdev_zlib_pmd.py
+++ b/tests/TestSuite_compressdev_zlib_pmd.py
@@ -41,7 +41,6 @@ from framework.test_case import TestCase
class TestCompressdevZlibPmd(TestCase):
def set_up_all(self):
- self.prepare_dpdk()
cc.default_eals.update({"a":"0000:00:00.0", "vdev": "compress_zlib"})
cc.default_opts.update({"driver-name": "compress_zlib"})
self._perf_result = dict()
@@ -53,13 +52,6 @@ class TestCompressdevZlibPmd(TestCase):
cc.default_eals = copy.deepcopy(self.eals)
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):
cc.run_unit(self)
@@ -88,14 +80,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:
- return
- with open(self.logger.log_path + "/" + self.suite_name + ".json", "a") as fv:
- json.dump(self._perf_result, fv, indent=4)
+ if self._perf_result:
+ with open(self.logger.log_path + "/" + self.suite_name + ".json", "a") as fv:
+ json.dump(self._perf_result, fv, indent=4)
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_fips_cryptodev.py b/tests/TestSuite_fips_cryptodev.py
index 39b30c6a..29a71990 100644
--- a/tests/TestSuite_fips_cryptodev.py
+++ b/tests/TestSuite_fips_cryptodev.py
@@ -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):
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 57ca79d9..ddeb3af5 100644
--- a/tests/TestSuite_ipsec_gw_cryptodev_func.py
+++ b/tests/TestSuite_ipsec_gw_cryptodev_func.py
@@ -99,7 +99,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 c2b05bad..a1e01174 100644
--- a/tests/TestSuite_kni.py
+++ b/tests/TestSuite_kni.py
@@ -260,10 +260,6 @@ class TestKni(TestCase):
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")
self.app_kni_path = self.dut.apps_name['kni']
self.verify('Error' not in out, "Compilation failed")
@@ -1236,9 +1232,5 @@ 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..36d3f31e 100644
--- a/tests/TestSuite_packet_capture.py
+++ b/tests/TestSuite_packet_capture.py
@@ -804,8 +804,6 @@ class TestPacketCapture(TestCase):
self.verify_supported_nic()
self.test_port0_id = 0
self.test_port1_id = 1
- # compile dpdk app with SW CONFIG_RTE_LIBRTE_PMD_PCAP open
- self.dut_skip_compile = self.dut.skip_setup
# used for save log
self.pdump_log = os.sep.join(["/tmp", 'pdumpLog'])
if not self.is_existed_on_crb(self.pdump_log):
@@ -815,14 +813,6 @@ 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)
self.dut_dpdk_pdump_dir = self.dut.apps_name['pdump']
self.tool_name = self.dut_dpdk_pdump_dir.split('/')[-1]
@@ -877,15 +867,4 @@ class TestPacketCapture(TestCase):
self.reset_ASLR()
self.session_ex.close()
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
- self.dut.build_install_dpdk(self.target)
- self.dut.skip_setup = skip_setup
self.dut.kill_all()
diff --git a/tests/TestSuite_pmd.py b/tests/TestSuite_pmd.py
index 52250023..781df5ca 100644
--- a/tests/TestSuite_pmd.py
+++ b/tests/TestSuite_pmd.py
@@ -74,10 +74,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
self.dut_ports = self.dut.get_ports()
if self.dut.get_os_type() == 'linux':
diff --git a/tests/TestSuite_power_pbf.py b/tests/TestSuite_power_pbf.py
index 42d939cd..94692bc9 100644
--- a/tests/TestSuite_power_pbf.py
+++ b/tests/TestSuite_power_pbf.py
@@ -40,9 +40,6 @@ 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
@@ -148,13 +145,8 @@ class TestPowerPbf(TestCase):
def init_test_binary_file(self):
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)
+ SW = "RTE_LIBRTE_POWER_DEBUG"
+ self.dut.set_build_options({SW: '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_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_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_perf_cryptodev_func.py b/tests/TestSuite_virtio_perf_cryptodev_func.py
index 92765675..65045622 100644
--- a/tests/TestSuite_virtio_perf_cryptodev_func.py
+++ b/tests/TestSuite_virtio_perf_cryptodev_func.py
@@ -116,14 +116,6 @@ class VirtioCryptodevPerfTest(TestCase):
def dut_execut_cmd(self, cmdline, ex='#', timout=30):
return self.dut.send_expect(cmdline, ex, timout)
- def build_user_dpdk(self, user_dut):
- user_dut.send_expect(
- "sed -i 's/CONFIG_RTE_LIBRTE_PMD_AESNI_MB=n$/CONFIG_RTE_LIBRTE_PMD_AESNI_MB=y/' config/common_base", '#', 30)
- user_dut.send_expect(
- "sed -i 's/CONFIG_RTE_EAL_IGB_UIO=n/CONFIG_RTE_EAL_IGB_UIO=y/g' config/common_base", '#', 30)
- user_dut.set_build_options({'RTE_LIBRTE_PMD_AESNI_MB': 'y'})
- user_dut.build_install_dpdk(self.target)
-
def get_vhost_eal(self):
default_eal_opts = {
"c": None,
@@ -191,8 +183,6 @@ class VirtioCryptodevPerfTest(TestCase):
self.dut.skip_setup = skip_setup
vm_dut.restore_interfaces()
- if not self.dut.skip_setup:
- self.build_user_dpdk(vm_dut)
vm_dut.setup_modules(self.target, self.drivername, None)
vm_dut.bind_interfaces_linux(self.drivername)
vm.virtio_list = self.set_virtio_pci(vm_dut)
@@ -257,4 +247,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)
--
2.33.1.windows.1
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [dts] [V2 4/4] tests/*: removed makefile from test suite
2022-02-25 5:43 ` [dts] [V2 4/4] tests/*: removed makefile from test suite Jun Dong
@ 2022-02-27 14:27 ` Tu, Lijuan
0 siblings, 0 replies; 6+ messages in thread
From: Tu, Lijuan @ 2022-02-27 14:27 UTC (permalink / raw)
To: Dong, JunX, dts; +Cc: Sun, QingX
> -----Original Message-----
> From: Dong, JunX <junx.dong@intel.com>
> Sent: 2022年2月25日 13:44
> To: dts@dpdk.org
> Cc: Tu, Lijuan <lijuan.tu@intel.com>; Sun, QingX <qingx.sun@intel.com>; Dong,
> JunX <junx.dong@intel.com>
> Subject: [dts] [V2 4/4] tests/*: removed makefile from test suite
>
> Makefile builds have been deprecated, so:
> - Removed makefile handle codes.
> - Update context code structure after removed makefile relation codes.
>
> Signed-off-by: Jun Dong <junx.dong@intel.com>
Series applied.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-02-27 14:27 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-25 5:43 [dts] [V2 0/4] removed makefile relation content Jun Dong
2022-02-25 5:43 ` [dts] [V2 1/4] executions/execution*: removed makefile from configure Jun Dong
2022-02-25 5:43 ` [dts] [V2 2/4] doc/dts_gsg: removed makefile from user guide document Jun Dong
2022-02-25 5:43 ` [dts] [V2 3/4] framework/*: removed makefile from framework Jun Dong
2022-02-25 5:43 ` [dts] [V2 4/4] tests/*: removed makefile from test suite Jun Dong
2022-02-27 14:27 ` Tu, Lijuan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).