aboutsummaryrefslogtreecommitdiffstats
path: root/src/osmo_gsm_tester/osmo_nitb.py
diff options
context:
space:
mode:
authorYour Name <you@example.com>2017-04-08 18:52:39 +0200
committerNeels Hofmeyr <nhofmeyr@sysmocom.de>2017-04-08 19:20:57 +0200
commit3c6673aa8ce3ff920f437aafd8db5245b2d6efc4 (patch)
tree4697ac7a3b51b7dde038563b0c4a429c781c4760 /src/osmo_gsm_tester/osmo_nitb.py
parentd46ea13d48a365c3c7bd2292b54717b0a1758299 (diff)
various fixes from first test runs
Diffstat (limited to 'src/osmo_gsm_tester/osmo_nitb.py')
-rw-r--r--src/osmo_gsm_tester/osmo_nitb.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/osmo_gsm_tester/osmo_nitb.py b/src/osmo_gsm_tester/osmo_nitb.py
index 3d5fc6a..7cdc124 100644
--- a/src/osmo_gsm_tester/osmo_nitb.py
+++ b/src/osmo_gsm_tester/osmo_nitb.py
@@ -43,11 +43,14 @@ class OsmoNitb(log.Origin):
self.log('Starting osmo-nitb')
self.run_dir = util.Dir(self.suite_run.trial.get_run_dir().new_dir(self.name()))
self.configure()
- inst = util.Dir(self.suite_run.trial.get_inst('openbsc'))
- binary = os.path.abspath(inst.child('bin', 'osmo-nitb'))
+ inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmo-nitb')))
+ binary = inst.child('bin', 'osmo-nitb')
if not os.path.isfile(binary):
raise RuntimeError('Binary missing: %r' % binary)
- env = { 'LD_LIBRARY_PATH': os.path.abspath(str(inst)) }
+ lib = inst.child('lib')
+ if not os.path.isdir(lib):
+ raise RuntimeError('No lib/ in %r' % inst)
+ env = { 'LD_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',