From: JiangYuX <yux.jiang@intel.com>
To: dts@dpdk.org
Cc: JiangYu <yux.jiang@intel.com>
Subject: [dts] [PATCH V1] tests/TestSuite_pvp_share_lib: adapt LD_LIBRARY_PATH for meson build
Date: Fri, 25 Sep 2020 14:16:39 +0800 [thread overview]
Message-ID: <20200925061639.15844-1-yux.jiang@intel.com> (raw)
From: JiangYu <yux.jiang@intel.com>
Adapt LD_LIBRARY_PATH for meson build
Signed-off-by: JiangYu <yux.jiang@intel.com>
---
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):
--
2.7.4
next reply other threads:[~2020-09-25 6:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-25 6:16 JiangYuX [this message]
2020-09-25 6:27 ` Jiang, YuX
2020-10-12 8:52 ` Tu, Lijuan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200925061639.15844-1-yux.jiang@intel.com \
--to=yux.jiang@intel.com \
--cc=dts@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).