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 8480DA04B7; Thu, 17 Sep 2020 03:08:46 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E8B781D424; Thu, 17 Sep 2020 03:08:45 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 1B4801D15D for ; Thu, 17 Sep 2020 03:08:43 +0200 (CEST) IronPort-SDR: gFTkOV0t1HphQQdtXv/fkNlMNahxyjmzTPgXyC9wScaO1on5y15BmVnzvV1+PYkwfKjg+8weqr H8ZffbSbY5FQ== X-IronPort-AV: E=McAfee;i="6000,8403,9746"; a="147284409" X-IronPort-AV: E=Sophos;i="5.76,434,1592895600"; d="scan'208";a="147284409" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Sep 2020 18:08:43 -0700 IronPort-SDR: XLF/OPgnZFYqI482VRzw/DTEq+F11ld2cMlKYSJZD1nHu4xpJyDTlRoY/B0Fj/6Wt7QNIy3NdY E0MV3ugprqYg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,434,1592895600"; d="scan'208";a="331931470" Received: from dpdk-moyufen06.sh.intel.com ([10.67.116.208]) by fmsmga004.fm.intel.com with ESMTP; 16 Sep 2020 18:08:42 -0700 From: yufengmx To: dts@dpdk.org, lei.a.yao@intel.com Cc: yufengmx Date: Thu, 17 Sep 2020 09:05:08 +0800 Message-Id: <20200917010513.15783-4-yufengx.mo@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200917010513.15783-1-yufengx.mo@intel.com> References: <20200917010513.15783-1-yufengx.mo@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dts] [PATCH V2 3/8] power_pbf: support meson 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_pbf.py | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/tests/TestSuite_power_pbf.py b/tests/TestSuite_power_pbf.py index eb5a16e..6109a3b 100644 --- a/tests/TestSuite_power_pbf.py +++ b/tests/TestSuite_power_pbf.py @@ -40,6 +40,8 @@ from collections import Counter from pprint import pformat # import dts libs +from settings import load_global_setting +from settings import HOST_BUILD_TYPE_SETTING from test_case import TestCase from exception import VerifyFailure from utils import create_mask @@ -136,13 +138,8 @@ class TestPowerPbf(TestCase): def prepare_binary(self, name): example_dir = "examples/" + name out = self.dut.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 '*'".format(binary_dir), '# ', 5] - exec_file = self.d_a_con(cmd) - binary_file = os.path.join(binary_dir, exec_file[:-1]) - return binary_file + return os.path.join(self.target_dir, + self.dut.apps_name[os.path.basename(name)]) def create_powermonitor_folder(self): cmd = 'mkdir -p {0}; chmod 777 {0}'.format('/tmp/powermonitor') @@ -151,12 +148,13 @@ class TestPowerPbf(TestCase): def init_test_binary_file(self): self.create_powermonitor_folder() # open debug SW - cmd = ("sed -i -e 's/" - "CONFIG_RTE_LIBRTE_POWER_DEBUG=n$/" - "CONFIG_RTE_LIBRTE_POWER_DEBUG=y/" - "' {0}/config/common_base").format(self.target_dir) - self.d_a_con(cmd) - self.dut.skip_setup = False + 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) 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') -- 2.21.0