From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id F4040A0350; Mon, 28 Feb 2022 09:53:50 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E515941159; Mon, 28 Feb 2022 09:53:50 +0100 (CET) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mails.dpdk.org (Postfix) with ESMTP id 6074B4068C for ; Mon, 28 Feb 2022 09:53:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1646038428; x=1677574428; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=UZftMYkmNWVM8FJWgb3kC4REBXWXehvV+ITxsMkkCMM=; b=MJhU7PPnwA5sVx1LCNNawHkWuxDP0RN0tLlEMCQCsdF4iYTn56Smncol K/ewpGb480EhgkOGtVcVfkASb9i4IbuoBIRTQaYNMLYqVLt68B+NqC6pl 4PhIBre7MAfsyUaq8aJUnHNBVShpU4CqBBMwo1dLKhWdgAYWzcFb6Rz8L 0hS/mhwDBrGuALrO+vpU0huVEIghrrKRcRXQsqQwiTY7286VrRXpBKWZG napWAkyK3ApT4FiCIYXahLfmN1MOFnYO8ixQ/SkSyB9mr5ie1NiWR6i7t 0PqEFWMJA3PjBCXTCZ1uyhc/ArgNCSBi8WHDMpXq0Vsoq2KgiC6i7Cgjy w==; X-IronPort-AV: E=McAfee;i="6200,9189,10271"; a="252764272" X-IronPort-AV: E=Sophos;i="5.90,142,1643702400"; d="scan'208";a="252764272" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Feb 2022 00:53:47 -0800 X-IronPort-AV: E=Sophos;i="5.90,142,1643702400"; d="scan'208";a="801937074" Received: from shwdenpg197.ccr.corp.intel.com ([10.253.109.70]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Feb 2022 00:53:42 -0800 From: Jun Dong To: dts@dpdk.org Cc: lijuan.tu@intel.com, qingx.sun@intel.com, junx.dong@intel.com Subject: [dts] [V1] removed changing source code before meson build Date: Mon, 28 Feb 2022 16:53:36 +0800 Message-Id: <20220228085336.3999-1-junx.dong@intel.com> X-Mailer: git-send-email 2.33.1.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dts-bounces@dpdk.org Signed-off-by: Jun Dong --- framework/project_dpdk.py | 2 +- tests/TestSuite_ieee1588.py | 5 ++--- tests/TestSuite_nic_single_core_perf.py | 13 +++++-------- tests/TestSuite_power_pbf.py | 6 ++---- tests/TestSuite_ptpclient.py | 8 +++----- 5 files changed, 13 insertions(+), 21 deletions(-) diff --git a/framework/project_dpdk.py b/framework/project_dpdk.py index f6cf6aa6..ccdb5814 100644 --- a/framework/project_dpdk.py +++ b/framework/project_dpdk.py @@ -243,7 +243,7 @@ class DPDKdut(Dut): """ use_shared_lib = load_global_setting(HOST_SHARED_LIB_SETTING) if use_shared_lib == 'true' and 'Virt' not in str(self): - self.set_build_options({'RTE_BUILD_SHARED_LIB': 'y'}) + extra_options += ' -Dc_args=-DRTE_BUILD_SHARED_LIB' if self.get_os_type() == 'linux': self.build_install_dpdk_linux_meson(target, extra_options) elif self.get_os_type() == 'freebsd': diff --git a/tests/TestSuite_ieee1588.py b/tests/TestSuite_ieee1588.py index d61f2a53..837e46ce 100644 --- a/tests/TestSuite_ieee1588.py +++ b/tests/TestSuite_ieee1588.py @@ -54,10 +54,9 @@ class TestIeee1588(TestCase): dutPorts = self.dut.get_ports() self.verify(len(dutPorts) > 0, "No ports found for " + self.nic) - # Change the config file to support IEEE1588 and recompile the package. - self.dut.set_build_options({'RTE_LIBRTE_IEEE1588': 'y'}) + # recompile the package with extra options of support IEEE1588. self.dut.skip_setup = False - self.dut.build_install_dpdk(self.target) + self.dut.build_install_dpdk(self.target, extra_options='-Dc_args=-DRTE_LIBRTE_IEEE1588') self.pmdout = PmdOutput(self.dut) # For IEEE1588, the full-feature tx path needs to be enabled. diff --git a/tests/TestSuite_nic_single_core_perf.py b/tests/TestSuite_nic_single_core_perf.py index e1020895..88f1ad7a 100644 --- a/tests/TestSuite_nic_single_core_perf.py +++ b/tests/TestSuite_nic_single_core_perf.py @@ -65,12 +65,13 @@ class TestNicSingleCorePerf(TestCase): err_msg = "Rx desc only has 16B and 32B size, %d is not valid" % self.rx_desc_size self.verify(self.rx_desc_size == 16 or self.rx_desc_size == 32, err_msg) if self.rx_desc_size == 16: - # Update DPDK config file and rebuild to get best perf on fortville + extra_options = '' + # rebuild to get best perf on fortville if self.nic in ["fortville_25g", "fortville_spirit"]: - self.dut.set_build_options({'RTE_LIBRTE_I40E_16BYTE_RX_DESC': 'y'}) + extra_options = '-Dc_args=-DRTE_LIBRTE_I40E_16BYTE_RX_DESC' elif self.nic in ["columbiaville_100g", "columbiaville_25g", "columbiaville_25gx2"]: - self.dut.set_build_options({'RTE_LIBRTE_ICE_16BYTE_RX_DESC': 'y'}) - self.dut.build_install_dpdk(self.target) + extra_options = '-Dc_args=-DRTE_LIBRTE_ICE_16BYTE_RX_DESC' + self.dut.build_install_dpdk(self.target, extra_options=extra_options) # Based on h/w type, choose how many ports to use self.dut_ports = self.dut.get_ports() @@ -426,9 +427,5 @@ class TestNicSingleCorePerf(TestCase): """ # resume setting if self.rx_desc_size == 16: - if self.nic in ["fortville_25g", "fortville_spirit"]: - self.dut.set_build_options({'RTE_LIBRTE_I40E_16BYTE_RX_DESC': 'n'}) - elif self.nic in ["columbiaville_100g", "columbiaville_25g", "columbiaville_25gx2"]: - self.dut.set_build_options({'RTE_LIBRTE_ICE_16BYTE_RX_DESC': 'n'}) self.dut.build_install_dpdk(self.target) self.dut.kill_all() diff --git a/tests/TestSuite_power_pbf.py b/tests/TestSuite_power_pbf.py index 94692bc9..f0969fb7 100644 --- a/tests/TestSuite_power_pbf.py +++ b/tests/TestSuite_power_pbf.py @@ -144,10 +144,8 @@ class TestPowerPbf(TestCase): def init_test_binary_file(self): self.create_powermonitor_folder() - # open debug SW - SW = "RTE_LIBRTE_POWER_DEBUG" - self.dut.set_build_options({SW: 'y'}) - self.dut.build_install_dpdk(self.target) + # open debug SW when build dpdk + self.dut.build_install_dpdk(self.target, extra_param='-Dc_args=-DRTE_LIBRTE_POWER_DEBUG') # set up vm power management binary process setting self.vm_power_mgr = self.prepare_binary('vm_power_manager') # set up distributor binary process setting diff --git a/tests/TestSuite_ptpclient.py b/tests/TestSuite_ptpclient.py index f97e211f..45c6a494 100644 --- a/tests/TestSuite_ptpclient.py +++ b/tests/TestSuite_ptpclient.py @@ -53,10 +53,9 @@ class TestPtpClient(TestCase): dutPorts = self.dut.get_ports() self.verify(len(dutPorts) > 0, "No ports found for " + self.nic) - # Change the config file to support IEEE1588 and recompile the package. - self.dut.set_build_options({'RTE_LIBRTE_IEEE1588': 'y'}) + # recompile the package with extra options of support IEEE1588. self.dut.skip_setup = False - self.dut.build_install_dpdk(self.target) + self.dut.build_install_dpdk(self.target, extra_options='-Dc_args=-DRTE_LIBRTE_IEEE1588') # build sample app out = self.dut.build_dpdk_apps("examples/ptpclient") @@ -179,6 +178,5 @@ class TestPtpClient(TestCase): out = self.dut.send_expect("hwclock", "# ") rtc_time = re.findall(r"(\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2})", out)[0] self.dut.send_command('date -s "%s"' % rtc_time, "# ") - # Restore the config file and recompile the package. - self.dut.set_build_options({'RTE_LIBRTE_IEEE1588': 'n'}) + # recompile the package without extra options of support IEEE1588. self.dut.build_install_dpdk(self.target) -- 2.33.1.windows.1