aboutsummaryrefslogtreecommitdiffstats
path: root/src/osmo_gsm_tester/osmo_nitb.py
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2017-05-08 16:21:38 +0200
committerPau Espin Pedrol <pespin@sysmocom.de>2017-05-08 16:34:30 +0200
commite39c6f1a5202ed066ea05fac9056abfd11166857 (patch)
tree099affe164d42ad4232b3872a1e527eaac7ac42f /src/osmo_gsm_tester/osmo_nitb.py
parenta88b0c74249db42159f2dbc5e299cad5288c0f96 (diff)
Prepend LD_LIBRARY_PATH instead of overwritting it
My current distribution ships a newer libcrypto and libssl which are not ABI compatible with the ones generated by Jenkins. I had to copy those libraries locally and use LD_LIBRARY_PATH to be able to run binaries compiled coming from the jenkins slave. Without this patch I am not able to run it because it is overwriting the previous variable. Change-Id: Id9b16d13d343616cbf87b9da8a99e3fae48da6bd
Diffstat (limited to 'src/osmo_gsm_tester/osmo_nitb.py')
-rw-r--r--src/osmo_gsm_tester/osmo_nitb.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/osmo_gsm_tester/osmo_nitb.py b/src/osmo_gsm_tester/osmo_nitb.py
index 4cd6055..3ed48b2 100644
--- a/src/osmo_gsm_tester/osmo_nitb.py
+++ b/src/osmo_gsm_tester/osmo_nitb.py
@@ -50,7 +50,9 @@ class OsmoNitb(log.Origin):
lib = inst.child('lib')
if not os.path.isdir(lib):
raise RuntimeError('No lib/ in %r' % inst)
- env = { 'LD_LIBRARY_PATH': lib }
+
+ env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) }
+
self.dbg(run_dir=self.run_dir, binary=binary, env=env)
self.process = process.Process(self.name(), self.run_dir,
(binary, '-c',