From patchwork Fri Sep 25 06:16:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yu Jiang X-Patchwork-Id: 78789 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 DB362A04C3; Fri, 25 Sep 2020 08:19:56 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CB35B1E4E9; Fri, 25 Sep 2020 08:19:56 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id ED21D1E4E8 for ; Fri, 25 Sep 2020 08:19:54 +0200 (CEST) IronPort-SDR: bLwhIUxD8vMGlISCbxwPDIQDkA1s5/Rnyyj7Imw8PhoOUPqY6N0YSXJldz7HPU61r0glhiGSH/ mqhznrdG4mdQ== X-IronPort-AV: E=McAfee;i="6000,8403,9754"; a="160702206" X-IronPort-AV: E=Sophos;i="5.77,301,1596524400"; d="scan'208";a="160702206" 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; 24 Sep 2020 23:19:54 -0700 IronPort-SDR: RzIjRibzJnL+1eiRkWqoOYuvs+wfwK6mCM7IWlUjdpDVilcegow3sw2F3eSx10uCr3kyE8xseK yuAdLZY8JKkQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,301,1596524400"; d="scan'208";a="323258476" Received: from unknown (HELO localhost.localdomain) ([10.240.183.80]) by orsmga002.jf.intel.com with ESMTP; 24 Sep 2020 23:19:52 -0700 From: JiangYuX To: dts@dpdk.org Cc: JiangYu Date: Fri, 25 Sep 2020 14:16:39 +0800 Message-Id: <20200925061639.15844-1-yux.jiang@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dts] [PATCH V1] tests/TestSuite_pvp_share_lib: adapt LD_LIBRARY_PATH for 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 Adapt LD_LIBRARY_PATH for meson build Signed-off-by: JiangYu Tested-by: Jiang, YuX --- tests/TestSuite_pvp_share_lib.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/TestSuite_pvp_share_lib.py b/tests/TestSuite_pvp_share_lib.py index 56435db..50986c1 100644 --- a/tests/TestSuite_pvp_share_lib.py +++ b/tests/TestSuite_pvp_share_lib.py @@ -79,9 +79,15 @@ 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") - self.vhost_user.send_expect("export LD_LIBRARY_PATH=%s/%s/lib:$LD_LIBRARY_PATH" % + 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/lib:$LD_LIBRARY_PATH" % + 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), "# ") # Prepare the result table self.table_header = ['Frame'] @@ -93,10 +99,12 @@ class TestPVPShareLib(TestCase): 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.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.build_install_dpdk(self.dut.target) def send_and_verify(self):