summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPau Espin Pedrol <pespin@sysmocom.de>2017-08-21 19:03:08 +0200
committerPau Espin Pedrol <pespin@sysmocom.de>2017-08-21 19:03:10 +0200
commit80a5c77821aa6f33c44f9f6add64524c68684806 (patch)
treec26ea754582a8012585461fa65b6793fc0c831b1
parent3169ffbaeffd5f2b49ec3e5f48bf4d5710350b27 (diff)
bts_osmotrx: Allow LD_LIBRARY_PATH when loading osmo-trx
When splitting osmo-trx to its own class the env injection part was removed because it seemed not needed as it has no dependencies included by default in the trial. However, it may still be required by the osmo-gsm-tester main unit to launch osmo-gsm-tester with LD_PRELOAD_PATH to point to specific versions of libuhd, so let's add the env injection back in there. Change-Id: I069ba69f4207665c8c575fed0fc8ff164c571e36
-rw-r--r--src/osmo_gsm_tester/bts_osmotrx.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/osmo_gsm_tester/bts_osmotrx.py b/src/osmo_gsm_tester/bts_osmotrx.py
index 7496ce8..9795a58 100644
--- a/src/osmo_gsm_tester/bts_osmotrx.py
+++ b/src/osmo_gsm_tester/bts_osmotrx.py
@@ -132,6 +132,8 @@ class OsmoTrx(log.Origin):
def start(self):
self.run_dir = util.Dir(self.suite_run.get_test_run_dir().new_dir(self.name()))
self.inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst(OsmoTrx.BIN_TRX)))
+ lib = self.inst.child('lib')
+ self.env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) }
self.proc_trx = self.launch_process(OsmoTrx.BIN_TRX, '-x')
def launch_process(self, binary_name, *args):