From patchwork Thu Sep 17 09:36:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Jiang X-Patchwork-Id: 78034 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C865EA04BA; Thu, 17 Sep 2020 11:36:49 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B5B001C293; Thu, 17 Sep 2020 11:36:49 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 486361C244 for ; Thu, 17 Sep 2020 11:36:48 +0200 (CEST) IronPort-SDR: il0mebg8n/HXC0GADWXUEtviH/EoyRitkUonhztIa5fAF4CiS5BFu2qTnz08Wad31nUMBazNC0 1ijl4rQScNUg== X-IronPort-AV: E=McAfee;i="6000,8403,9746"; a="158965860" X-IronPort-AV: E=Sophos;i="5.76,436,1592895600"; d="scan'208";a="158965860" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Sep 2020 02:36:47 -0700 IronPort-SDR: D+dUXvXWfUNYk+PcFDObIiOLYdYDCq4XLyBa32W58FtTE2QYcWheRoOkgV8GrFJcxpi9oavsqj 3UUCLiJXOwmQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,436,1592895600"; d="scan'208";a="320156231" Received: from unknown (HELO localhost.localdomain) ([10.240.183.80]) by orsmga002.jf.intel.com with ESMTP; 17 Sep 2020 02:36:45 -0700 From: JiangYuX To: dts@dpdk.org Cc: JiangYu Date: Thu, 17 Sep 2020 17:36:56 +0800 Message-Id: <20200917093656.14417-1-yux.jiang@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dts] [PATCH V1] tests/TestSuite_vhost_1024_ethports: 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" From: JiangYu 1, adapt meson build: include app_name, killall app_name, build method 2, optimize checkpoints. Signed-off-by: JiangYu Tested-by: Jiang, YuX Acked-by: lihongx Ma --- tests/TestSuite_vhost_1024_ethports.py | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/tests/TestSuite_vhost_1024_ethports.py b/tests/TestSuite_vhost_1024_ethports.py index b764936..afac0fa 100644 --- a/tests/TestSuite_vhost_1024_ethports.py +++ b/tests/TestSuite_vhost_1024_ethports.py @@ -52,24 +52,30 @@ class TestVhost1024Ethports(TestCase): cores = self.dut.get_core_list("1S/2C/1T") self.pci_info = self.dut.ports_info[0]['pci'] self.build_user_dpdk() + self.testpmd_path=self.dut.apps_name['test-pmd'] + self.testpmd_name = self.testpmd_path.split("/")[-1] def set_up(self): """ Run before each test case. """ self.dut.send_expect('rm -rf ./vhost-net*', '# ') - self.dut.send_expect('killall -s INT testpmd', '# ') + self.dut.send_expect('killall -s INT %s' % self.testpmd_name, '# ') self.vhost_user = self.dut.new_session(suite='vhost-user') def build_user_dpdk(self): - self.dut.send_expect( - "sed -i 's/CONFIG_RTE_MAX_ETHPORTS=32$/CONFIG_RTE_MAX_ETHPORTS=1024/' config/common_base", '#', 30) - self.dut.build_install_dpdk(self.target) + if self.dut.build_type == "meson": + self.dut.build_install_dpdk(self.target, extra_options="-Dmax_ethports=1024") + else: + self.dut.send_expect("sed -i 's/CONFIG_RTE_MAX_ETHPORTS=32$/CONFIG_RTE_MAX_ETHPORTS=1024/' config/common_base", '#', 30) + self.dut.build_install_dpdk(self.target) def restore_dpdk(self): - self.dut.send_expect( - "sed -i 's/CONFIG_RTE_MAX_ETHPORTS=1024$/CONFIG_RTE_MAX_ETHPORTS=32/' config/common_base", '#', 30) - self.dut.build_install_dpdk(self.target) + if self.dut.build_type == "meson": + self.dut.build_install_dpdk(self.target, extra_options="-Dmax_ethports=32") + else: + self.dut.send_expect("sed -i 's/CONFIG_RTE_MAX_ETHPORTS=1024$/CONFIG_RTE_MAX_ETHPORTS=32/' config/common_base", '#', 30) + self.dut.build_install_dpdk(self.target) @property def check_2M_env(self): @@ -88,9 +94,10 @@ class TestVhost1024Ethports(TestCase): for ethport in range(self.max_ethport): command_line_vdev += '--vdev "eth_vhost%d,iface=vhost-net%d,queues=%d" ' %(ethport, ethport, self.queue) eal_params = self.dut.create_eal_parameters(cores="1S/2C/1T", prefix='vhost', ports=[self.pci_info]) - command_line_client = self.dut.target + '/app/testpmd ' + eal_params + command_line_vdev + ' -- -i' + command_line_client = self.testpmd_path + eal_params + command_line_vdev + ' -- -i' try: out = self.vhost_user.send_expect(command_line_client, 'testpmd> ', 120) + self.verify("Failed to create eth_vhost" not in out, "Failed to create some vhost_ethports") except Exception as e: self.verify(0, 'start testpmd failed') self.vhost_user.send_expect("quit", "#", 120)