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 E2ABEA00C2; Mon, 28 Mar 2022 18:14:51 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DE2A542883; Mon, 28 Mar 2022 18:14:51 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mails.dpdk.org (Postfix) with ESMTP id B7CE0427FD for ; Mon, 28 Mar 2022 18:14:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1648484089; x=1680020089; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=MhmbFbXkoSqnLcmfTBM9JKih7KXH2qUlaX9vXGkoxWQ=; b=EoPAyMu3jh5wvyk/GHOEeubhFQHm9AFM/zrSGr3LIVnrw8uQNCnuIaV7 FulKn0mck/TYJfzB+zCEul2RRA3uRdBRj4G1em9gx3iGPg5iLuZHs/s8a 2xJJig41g+OlMaNC4SMNiezpFCqC4/PhbN2+Ddjepmv+5rxnbRRTro6Fy ZjPRJXPRIctWmT+fXbRIdwyQ/CsLvGOUYLV1ceeK3o3TinoDGx5GxKCgE yd/QKXbL/KuX41keMLq73pmbWScnCX2zA+PGCMi84lMHqTiWLthIanRQi r1Z3LtIUkzpONoTdOQgvWq9rQ4Q0FBk2Xh3U5dScTK6WfeEHQvDtJx9p2 A==; X-IronPort-AV: E=McAfee;i="6200,9189,10300"; a="256616716" X-IronPort-AV: E=Sophos;i="5.90,217,1643702400"; d="scan'208";a="256616716" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Mar 2022 09:13:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.90,217,1643702400"; d="scan'208";a="604155650" Received: from silpixa00401183.ir.intel.com ([10.55.129.105]) by fmsmga008.fm.intel.com with ESMTP; 28 Mar 2022 09:13:53 -0700 From: Tadhg Kearney To: dts@dpdk.org Cc: reshma.pattan@intel.com, Tadhg Kearney Subject: [dts][V2 2/2] tests/*: Remove old DPDK flags from power tests Date: Mon, 28 Mar 2022 16:13:49 +0000 Message-Id: <20220328161349.1118567-3-tadhg.kearney@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220328161349.1118567-1-tadhg.kearney@intel.com> References: <20220328161349.1118567-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 | 30 +-------------------------- tests/TestSuite_power_telemetry.py | 10 +-------- 2 files changed, 2 insertions(+), 38 deletions(-) diff --git a/tests/TestSuite_power_branch_ratio.py b/tests/TestSuite_power_branch_ratio.py index deb271e0..a6cd0fb7 100644 --- a/tests/TestSuite_power_branch_ratio.py +++ b/tests/TestSuite_power_branch_ratio.py @@ -45,7 +45,7 @@ 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,24 +227,7 @@ 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) @@ -258,17 +241,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) diff --git a/tests/TestSuite_power_telemetry.py b/tests/TestSuite_power_telemetry.py index afb55262..1bcb4d67 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 @@ -128,14 +128,6 @@ class TestPowerTelemetry(TestCase): 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) -- 2.25.1