commit f658b83b07317d29b22c86adc7f7b9229f93af72
author Holger Hans Peter Freyther <holger@moiji-mobile.com> Mon Nov 05 05:05:43 2018 +0000
committer Holger Freyther <holger@freyther.de> Wed Nov 14 21:03:23 2018 +0000
tree 8bd5852945f784e6cee36a99e2e304c2070c1896
parent 9cf1c8afde842febc02ce5fe6f931fe797236a84

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

src/osmo_ms_driver/__main__.py

diff --git a/src/osmo_ms_driver/__main__.py b/src/osmo_ms_driver/__main__.py
index 1573084..265ce47 100644
--- a/src/osmo_ms_driver/__main__.py
+++ b/src/osmo_ms_driver/__main__.py
@@ -20,6 +20,7 @@
 from .simple_loop import SimpleLoop
 from .location_update_test import MassUpdateLocationTest
 from .cdf import cdfs
+from .starter import BinaryOptions
 from osmo_gsm_tester import log
 
 # System modules
@@ -82,7 +83,8 @@
     ev_server.listen(loop)
 
     # Just a single test for now.
-    test = MassUpdateLocationTest("lu_test", args.num_ms, cdf, ev_server, tmp_dir)
+    options = BinaryOptions("virtphy", "mobile", None)
+    test = MassUpdateLocationTest("lu_test", options, args.num_ms, cdf, ev_server, tmp_dir)
     atexit.register(test.stop_all)
 
     # Run until everything has been launched