aboutsummaryrefslogtreecommitdiffstats
path: root/src/osmo_gsm_tester/ms_driver.py
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <holger@moiji-mobile.com>2018-11-05 05:05:43 +0000
committerHolger Freyther <holger@freyther.de>2018-11-14 21:03:23 +0000
commitf658b83b07317d29b22c86adc7f7b9229f93af72 (patch)
tree8bd5852945f784e6cee36a99e2e304c2070c1896 /src/osmo_gsm_tester/ms_driver.py
parent9cf1c8afde842febc02ce5fe6f931fe797236a84 (diff)
ms_driver: Allow to specify env and binary name/path
For the proper trial/suite integration we can't assume that the virtphy/mobile are in the PATH and that they can be executed directly (e.g. need a LD_LIBRARY_PATH to be applied). Introduce BinaryOptions to pass the name/path of the two executables and the env to use. Default this to virtphy/mobile and an empty environment. Change-Id: I79a57e53bc20613ac061453c24fd29a6d05e1721
Diffstat (limited to 'src/osmo_gsm_tester/ms_driver.py')
-rw-r--r--src/osmo_gsm_tester/ms_driver.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/osmo_gsm_tester/ms_driver.py b/src/osmo_gsm_tester/ms_driver.py
index a4d81c1..86186b7 100644
--- a/src/osmo_gsm_tester/ms_driver.py
+++ b/src/osmo_gsm_tester/ms_driver.py
@@ -21,6 +21,7 @@ from osmo_ms_driver.cdf import cdfs
from osmo_ms_driver.event_server import EventServer
from osmo_ms_driver.simple_loop import SimpleLoop
from osmo_ms_driver.location_update_test import MassUpdateLocationTest
+from osmo_ms_driver.starter import BinaryOptions
import os.path
import shutil
@@ -83,7 +84,9 @@ class MsDriver(log.Origin):
self._ev_server = EventServer("ev_server", event_server_path)
self._ev_server.listen(self._loop)
- self._test_case = MassUpdateLocationTest("mass", self._num_ms, self._cdf, self._ev_server, self.event_server_sk_tmp_dir)
+ options = BinaryOptions("virtphy", "mobile", None)
+ self._test_case = MassUpdateLocationTest("mass", options, self._num_ms, self._cdf,
+ self._ev_server, self.event_server_sk_tmp_dir)
# TODO: We should pass subscribers down to the test and not get it from
# there.