test suite reviews and discussions
 help / color / mirror / Atom feed
* [dts] [PATCH V1] tests/TestSuite_pvp_share_lib: adapt LD_LIBRARY_PATH for meson build
@ 2020-09-25  6:16 JiangYuX
  2020-09-25  6:27 ` Jiang, YuX
  2020-10-12  8:52 ` Tu, Lijuan
  0 siblings, 2 replies; 3+ messages in thread
From: JiangYuX @ 2020-09-25  6:16 UTC (permalink / raw)
  To: dts; +Cc: JiangYu

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


^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-10-12  8:52 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-25  6:16 [dts] [PATCH V1] tests/TestSuite_pvp_share_lib: adapt LD_LIBRARY_PATH for meson build JiangYuX
2020-09-25  6:27 ` Jiang, YuX
2020-10-12  8:52 ` Tu, Lijuan

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).