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 9C66DA0509; Tue, 29 Mar 2022 12:24:16 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9708C42818; Tue, 29 Mar 2022 12:24:16 +0200 (CEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mails.dpdk.org (Postfix) with ESMTP id 72DD24281B for ; Tue, 29 Mar 2022 12:24:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1648549455; x=1680085455; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zj34JRaIylt3X49r6XsIrHhG8xEoyDfAmG2cky8cAbQ=; b=ODHHI2TavFq33bwUwyU0ipnAoAnOBt9Rft3AS/AqJMGdeqK0vtHfhgcO 6cVBiRHd5I2TQP/2pXyp7WVmWvW/C9zew/CMQwRbME3UkaXqVVf45GBU1 atvIU0ddkxAmYmflKT5kjqK+bo+KAASCYQlKpSJxEN+UneIj/5UoKv/Di G2Gy39JDg7MoRxz7d9M4WnxU+pWicAdwNaaSi5izecXn/RPTQwKpH6M01 LWeMYGUAKqd/isyManuBN20I6p9InTv/ISS34Oi+AeGT/RWmXBbTA3/f0 c0TGMut4gHZVD5CgB5Cu2/Vy4QP165FR84EijivS+ZZMuN6kh8/ppVmdh g==; X-IronPort-AV: E=McAfee;i="6200,9189,10300"; a="239811230" X-IronPort-AV: E=Sophos;i="5.90,220,1643702400"; d="scan'208";a="239811230" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Mar 2022 03:24:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,220,1643702400"; d="scan'208";a="546332889" Received: from silpixa00401183.ir.intel.com ([10.55.129.105]) by orsmga007.jf.intel.com with ESMTP; 29 Mar 2022 03:24:13 -0700 From: Tadhg Kearney To: dts@dpdk.org Cc: reshma.pattan@intel.com, Tadhg Kearney Subject: [dts][V3 2/2] tests/*: Remove old DPDK flags from power tests Date: Tue, 29 Mar 2022 10:24:08 +0000 Message-Id: <20220329102408.1137392-3-tadhg.kearney@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220329102408.1137392-1-tadhg.kearney@intel.com> References: <20220329102408.1137392-1-tadhg.kearney@intel.com> 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 * CONFIG_RTE_LIBRTE_I40E_PMD, CONFIG_RTE_LIBRTE_POWER + _CONFIG option do not exist anymore * Telemetry is built by default + _LIBRTE_ option also does not exist anymore Signed-off-by: Tadhg Kearney --- tests/TestSuite_power_branch_ratio.py | 39 +-------------------------- tests/TestSuite_power_telemetry.py | 18 +------------ 2 files changed, 2 insertions(+), 55 deletions(-) diff --git a/tests/TestSuite_power_branch_ratio.py b/tests/TestSuite_power_branch_ratio.py index deb271e0..a2c28478 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 @@ -227,27 +226,6 @@ class TestPowerBranchRatio(TestCase): return result - @property - def compile_switch(self): - sw_table = [ - "CONFIG_RTE_LIBRTE_POWER", - "CONFIG_RTE_LIBRTE_POWER_DEBUG", - ] - 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) - # re-compile dpdk source code - self.dut.build_install_dpdk(self.target) - @contextmanager def restore_environment(self): try: @@ -258,19 +236,6 @@ class TestPowerBranchRatio(TestCase): self.restore_port_drv() 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) - # re-compile dpdk source code - self.dut.build_install_dpdk(self.target) def restore_port_drv(self): driver = self.drivername @@ -532,8 +497,6 @@ class TestPowerBranchRatio(TestCase): # modprobe msr module to let the application can get the CPU HW info self.d_a_con("modprobe msr") self.d_a_con("cpupower frequency-set -g userspace > /dev/null 2>&1") - # compile - self.preset_compilation() # init binary self.init_vm_power_mgr() self.init_testpmd() diff --git a/tests/TestSuite_power_telemetry.py b/tests/TestSuite_power_telemetry.py index afb55262..39acdef2 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 @@ -125,20 +125,6 @@ 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): - 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) - def prepare_binary(self, name): example_dir = "examples/" + name out = self.dut.build_dpdk_apps("./" + example_dir) @@ -445,8 +431,6 @@ class TestPowerTelemetry(TestCase): def preset_test_environment(self): self.is_l3fwd_on = None - # open compile switch and re-compile target source code - self.preset_compilation() # init binary self.init_l3fwd_power() self.init_telemetry() -- 2.25.1