From patchwork Fri Oct 30 13:56:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ling, WeiX" X-Patchwork-Id: 82858 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 60D14A04DD; Fri, 30 Oct 2020 07:00:16 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1F12F5F13; Fri, 30 Oct 2020 07:00:15 +0100 (CET) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id E1DE05B38 for ; Fri, 30 Oct 2020 07:00:12 +0100 (CET) IronPort-SDR: fo9qfRBA1L/G6V5I4sJ3ydfrELzCFGyksPXIIC/4QbGBohTT0CHfU1goSjfSeqPPKT4TrxzY0g ZUxrR/OiW3HQ== X-IronPort-AV: E=McAfee;i="6000,8403,9789"; a="253272066" X-IronPort-AV: E=Sophos;i="5.77,432,1596524400"; d="scan'208";a="253272066" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Oct 2020 23:00:10 -0700 IronPort-SDR: Zfol9zHr9xQ/Kfg2RYN+5+OUerp8EyeUlMO7dEE2D4TICFhHW5FcP4e3Po1oo7f7bHcVy8YnN8 kc3UlthYGYYg== X-IronPort-AV: E=Sophos;i="5.77,432,1596524400"; d="scan'208";a="536950960" Received: from unknown (HELO localhost.localdomain) ([10.240.183.222]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Oct 2020 23:00:09 -0700 From: lingwei To: dts@dpdk.org Cc: lingwei Date: Fri, 30 Oct 2020 21:56:30 +0800 Message-Id: <20201030135630.23673-1-weix.ling@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dts] [PATCH V1] tests/TestSuite_pvp_share_lib: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" remove makefile build type, and support meson build. Signed-off-by: lingwei Tested-by: Ling, Wei Acked-by: Lihong Ma --- tests/TestSuite_pvp_share_lib.py | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/tests/TestSuite_pvp_share_lib.py b/tests/TestSuite_pvp_share_lib.py index 50986c1..6746ff8 100644 --- a/tests/TestSuite_pvp_share_lib.py +++ b/tests/TestSuite_pvp_share_lib.py @@ -79,16 +79,8 @@ class TestPVPShareLib(TestCase): self.dut.send_expect("killall -s INT %s" % self.testpmd_name, "#") self.vhost_user = self.dut.new_session(suite="vhost-user") self.virtio_user = self.dut.new_session(suite="virtio-user") - if self.dut.build_type == 'meson': - self.vhost_user.send_expect("export LD_LIBRARY_PATH=%s/%s/drivers:$LD_LIBRARY_PATH" % - (self.dut.base_dir, self.dut.target), "# ") - self.virtio_user.send_expect("export LD_LIBRARY_PATH=%s/%s/drivers:$LD_LIBRARY_PATH" % - (self.dut.base_dir, self.dut.target), "# ") - else: - self.vhost_user.send_expect("export LD_LIBRARY_PATH=%s/%s/lib:$LD_LIBRARY_PATH" % - (self.dut.base_dir, self.dut.target), "# ") - self.virtio_user.send_expect("export LD_LIBRARY_PATH=%s/%s/lib:$LD_LIBRARY_PATH" % - (self.dut.base_dir, self.dut.target), "# ") + self.vhost_user.send_expect("export LD_LIBRARY_PATH=%s/%s/drivers:$LD_LIBRARY_PATH" %(self.dut.base_dir, self.dut.target), "# ") + self.virtio_user.send_expect("export LD_LIBRARY_PATH=%s/%s/drivers:$LD_LIBRARY_PATH" %(self.dut.base_dir, self.dut.target), "# ") # Prepare the result table self.table_header = ['Frame'] self.table_header.append("Mode") @@ -98,13 +90,11 @@ class TestPVPShareLib(TestCase): self.result_table_create(self.table_header) def prepare_share_lib_env(self): - self.dut.send_expect("sed -i 's/CONFIG_RTE_BUILD_SHARED_LIB=n$/CONFIG_RTE_BUILD_SHARED_LIB=y/' config/common_base", "# ") - self.dut.set_build_options({"RTE_BUILD_SHARED_LIB" : "y"}) + self.dut.set_build_options({"RTE_BUILD_SHARED_LIB": "y"}) self.dut.build_install_dpdk(self.dut.target) def restore_env(self): - self.dut.send_expect("sed -i 's/CONFIG_RTE_BUILD_SHARED_LIB=y$/CONFIG_RTE_BUILD_SHARED_LIB=n/' config/common_base", "# ") - self.dut.set_build_options({"RTE_BUILD_SHARED_LIB" : "n"}) + self.dut.set_build_options({"RTE_BUILD_SHARED_LIB": "n"}) self.dut.build_install_dpdk(self.dut.target) def send_and_verify(self): @@ -146,9 +136,10 @@ class TestPVPShareLib(TestCase): """ start testpmd on vhost """ + self.pci_info = self.dut.ports_info[0]['pci'] eal_param = self.dut.create_eal_parameters(socket=self.ports_socket, cores=self.core_list_vhost_user, prefix='vhost', - vdevs=['net_vhost0,iface=vhost-net,queues=1']) - eal_param += " -d librte_pmd_vhost.so -d librte_pmd_%s.so -d librte_mempool_ring.so --file-prefix=vhost" % driver + vdevs=['net_vhost0,iface=vhost-net,queues=1'], ports=[self.pci_info]) + eal_param += " -d librte_net_vhost.so -d librte_net_%s.so -d librte_mempool_ring.so --file-prefix=vhost" % driver command_line_client = self.path + eal_param + ' -- -i' self.vhost_user.send_expect(command_line_client, "testpmd> ", 120) @@ -164,7 +155,7 @@ class TestPVPShareLib(TestCase): 'net_virtio_user0,mac=00:01:02:03:04:05,path=./vhost-net']) if self.check_2M_env: eal_param += " --single-file-segments" - eal_param += " -d librte_pmd_virtio.so -d librte_mempool_ring.so" + eal_param += " -d librte_net_virtio.so -d librte_mempool_ring.so" command_line_user = self.path + eal_param + " -- -i" self.virtio_user.send_expect(command_line_user, "testpmd> ", 120) self.virtio_user.send_expect("start", "testpmd> ", 120)