From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 48EAAA04B6; Thu, 17 Sep 2020 03:09:21 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 376A71D422; Thu, 17 Sep 2020 03:09:21 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id BAF611D15D for ; Thu, 17 Sep 2020 03:09:19 +0200 (CEST) IronPort-SDR: u6PmRNUMyD653HCzBgXgc/dD5qeYw1txeWvixZuNIe1C7oI2SLBzd1OIqcUYvehCmmedeZL/ig /cGMFM2gjOJQ== X-IronPort-AV: E=McAfee;i="6000,8403,9746"; a="147284448" X-IronPort-AV: E=Sophos;i="5.76,434,1592895600"; d="scan'208";a="147284448" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Sep 2020 18:09:19 -0700 IronPort-SDR: z2kcRnGv7wcru6M8XOeaTGhhJBSRPqSqM1BhnU3hdXpwm92aXjD9ZSSOJAu2iMxM+K27oGdR/Z OTS+gzIoFAqg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,434,1592895600"; d="scan'208";a="452086504" Received: from dpdk-moyufen06.sh.intel.com ([10.67.116.208]) by orsmga004.jf.intel.com with ESMTP; 16 Sep 2020 18:09:18 -0700 From: yufengmx To: dts@dpdk.org, lei.a.yao@intel.com Cc: yufengmx Date: Thu, 17 Sep 2020 09:05:51 +0800 Message-Id: <20200917010551.15829-2-yufengx.mo@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200917010551.15829-1-yufengx.mo@intel.com> References: <20200917010551.15829-1-yufengx.mo@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dts] [PATCH V1 1/1] power_branch_ratio: support meson build X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "dts" support meson build. Signed-off-by: yufengmx --- tests/TestSuite_power_branch_ratio.py | 61 +++++++++++++++------------ 1 file changed, 34 insertions(+), 27 deletions(-) diff --git a/tests/TestSuite_power_branch_ratio.py b/tests/TestSuite_power_branch_ratio.py index e6bda21..ad04b2f 100644 --- a/tests/TestSuite_power_branch_ratio.py +++ b/tests/TestSuite_power_branch_ratio.py @@ -42,6 +42,8 @@ from pprint import pformat import traceback +from settings import load_global_setting +from settings import HOST_BUILD_TYPE_SETTING from utils import create_mask as dts_create_mask from qemu_libvirt import LibvirtKvm from pktgen import TRANSMIT_CONT @@ -73,13 +75,8 @@ class TestPowerBranchRatio(TestCase): _host_crb = host_crb if host_crb else self.dut example_dir = "examples/" + name out = _host_crb.build_dpdk_apps('./' + example_dir) - self.verify("Error" not in out, "Compilation error") - self.verify("No such" not in out, "Compilation error") - binary_dir = os.path.join(self.target_dir, example_dir, 'build') - cmd = ["ls -F {0} | grep --color=never '*'".format(binary_dir), '# ', 5] - exec_file = self.execute_cmds(cmd, name=_host_crb.session.name) - binary_file = os.path.join(binary_dir, exec_file[:-1]) - return binary_file + return os.path.join(self.target_dir, + _host_crb.apps_name[os.path.basename(name)]) def add_console(self, session): self.ext_con[session.name] = [ @@ -287,18 +284,24 @@ class TestPowerBranchRatio(TestCase): [cmd_fmt('undefine', self.vm_name), '# '], ] self.d_a_con(cmds) - def preset_compilation(self): - ''' - ''' + @property + def compile_switch(self): sw_table = [ "CONFIG_RTE_LIBRTE_POWER", "CONFIG_RTE_LIBRTE_POWER_DEBUG", ] - for sw in sw_table: - cmd = ("sed -i -e " - "'s/{0}=n$/{0}=y/' " - "{1}/config/common_base").format(sw, self.target_dir) - self.d_a_con(cmd) + 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) @@ -308,16 +311,20 @@ class TestPowerBranchRatio(TestCase): yield finally: time.sleep(10) - self.restore_port_drv() - sw_table = [ - "CONFIG_RTE_LIBRTE_POWER", - "CONFIG_RTE_LIBRTE_POWER_DEBUG", - ] - for sw in sw_table: - cmd = ("sed -i -e " - "'s/{0}=y$/{0}=n/' " - "{1}/config/common_base").format(sw, self.target_dir) - self.d_a_con(cmd) + try: + 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) @@ -413,8 +420,8 @@ class TestPowerBranchRatio(TestCase): self.is_guest_on = False def init_vm_testpmd(self): - self.vm_testpmd = "{}/{}/app/testpmd".format( - self.target_dir, self.dut.target) + self.vm_testpmd = os.path.join(self.target_dir, + self.dut.apps_name['test-pmd']) def start_vm_testpmd(self): cores = [0, 1] -- 2.21.0