<p>Holger Freyther <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11599">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Pau Espin Pedrol: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ms_driver: Consult the suite to get the binaries<br><br>Change-Id: I7fbb04cf67fe21378aacefcf1a15533d20d10d49<br>---<br>M src/osmo_gsm_tester/ms_driver.py<br>1 file changed, 29 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_gsm_tester/ms_driver.py b/src/osmo_gsm_tester/ms_driver.py</span><br><span>index 36ba713..634370f 100644</span><br><span>--- a/src/osmo_gsm_tester/ms_driver.py</span><br><span>+++ b/src/osmo_gsm_tester/ms_driver.py</span><br><span>@@ -74,6 +74,33 @@</span><br><span> self.event_server_sk_tmp_dir = tempfile.mkdtemp('', 'ogteventserversk')</span><br><span> return os.path.join(self.event_server_sk_tmp_dir, 'osmo_ms_driver.unix')</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ def build_binary_options(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ """Builds an instance of BinaryOptions.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ Populates the BinaryOptions by searching the virtphy and mobile</span><br><span style="color: hsl(120, 100%, 40%);">+ application within the trial directory.</span><br><span style="color: hsl(120, 100%, 40%);">+ """</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Get the base directory for the virtphy/mobile application</span><br><span style="color: hsl(120, 100%, 40%);">+ inst = util.Dir(os.path.abspath(self.suite_run.trial.get_inst('osmocom-bb')))</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # Assume these are dynamically linked and verify there is a lib dir.</span><br><span style="color: hsl(120, 100%, 40%);">+ lib = inst.child('lib')</span><br><span style="color: hsl(120, 100%, 40%);">+ if not os.path.isdir(lib):</span><br><span style="color: hsl(120, 100%, 40%);">+ raise RuntimeError('No lib/ in %r' % inst)</span><br><span style="color: hsl(120, 100%, 40%);">+ env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def check_and_return_binary(name):</span><br><span style="color: hsl(120, 100%, 40%);">+ """Checks the binary exists and returns the path."""</span><br><span style="color: hsl(120, 100%, 40%);">+ binary = inst.child('bin', name)</span><br><span style="color: hsl(120, 100%, 40%);">+ if not os.path.isfile(name):</span><br><span style="color: hsl(120, 100%, 40%);">+ raise RuntimeError('Binary missing: %r' % binary)</span><br><span style="color: hsl(120, 100%, 40%);">+ return binary</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ virtphy = check_and_return_binary('virtphy')</span><br><span style="color: hsl(120, 100%, 40%);">+ mobile = check_and_return_binary('mobile')</span><br><span style="color: hsl(120, 100%, 40%);">+ return BinaryOptions(virtphy, mobile, env)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> def configure(self):</span><br><span> """</span><br><span> Configures the subscribers, tests and registration server. Needs to be</span><br><span>@@ -83,10 +110,10 @@</span><br><span> </span><br><span> self._ev_server = EventServer("ev_server", event_server_path)</span><br><span> self._ev_server.listen(self._loop)</span><br><span style="color: hsl(0, 100%, 40%);">- options = BinaryOptions("virtphy", "mobile", None)</span><br><span style="color: hsl(120, 100%, 40%);">+ options = self.build_binary_options()</span><br><span> self._test_case = MassUpdateLocationTest("mass", options, self._num_ms, self._cdf,</span><br><span> self._ev_server,</span><br><span style="color: hsl(0, 100%, 40%);">- util.Dir(self.event_server_sk_tmp_dir),</span><br><span style="color: hsl(120, 100%, 40%);">+ util.Dir(self.suite_run.get_test_run_dir()),</span><br><span> suite_run=self._suite_run)</span><br><span> </span><br><span> # TODO: We should pass subscribers down to the test and not get it from</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11599">change 11599</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/11599"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I7fbb04cf67fe21378aacefcf1a15533d20d10d49 </div>
<div style="display:none"> Gerrit-Change-Number: 11599 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Holger Freyther <holger@freyther.de> </div>
<div style="display:none"> Gerrit-Reviewer: Holger Freyther <holger@freyther.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>