<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10815">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">measurement: fix unit-test test_lchan_meas_process_measurement<br><br>The unit test that tests lchan_meas_process_measurement() only inputs<br>test data to lchan_meas_process_measurement() but it is not checked if<br>the interval end could be detected or not.<br><br>- Add a return code to lchan_meas_process_measurement()<br>- Ensure that the return code is checked in the unit-test<br><br>Change-Id: I9e00ce683e8c44528804f65181dbfed9e85e3aed<br>Related: OS#2975<br>---<br>M include/osmo-bts/measurement.h<br>M src/common/measurement.c<br>M tests/meas/meas_test.c<br>3 files changed, 8 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/15/10815/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/measurement.h b/include/osmo-bts/measurement.h</span><br><span>index a2367c8..4f04ffa 100644</span><br><span>--- a/include/osmo-bts/measurement.h</span><br><span>+++ b/include/osmo-bts/measurement.h</span><br><span>@@ -8,7 +8,7 @@</span><br><span> </span><br><span> int lchan_meas_check_compute(struct gsm_lchan *lchan, uint32_t fn);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void lchan_meas_process_measurement(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn);</span><br><span style="color: hsl(120, 100%, 40%);">+int lchan_meas_process_measurement(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn);</span><br><span> </span><br><span> void lchan_meas_reset(struct gsm_lchan *lchan);</span><br><span> </span><br><span>diff --git a/src/common/measurement.c b/src/common/measurement.c</span><br><span>index 2af8bda..de3a82f 100644</span><br><span>--- a/src/common/measurement.c</span><br><span>+++ b/src/common/measurement.c</span><br><span>@@ -732,13 +732,13 @@</span><br><span> * l1sap.c every time a measurement indication is received. It collects the</span><br><span> * measurement samples and automatically detects the end oft the measurement</span><br><span> * interval. */</span><br><span style="color: hsl(0, 100%, 40%);">-void lchan_meas_process_measurement(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn)</span><br><span style="color: hsl(120, 100%, 40%);">+int lchan_meas_process_measurement(struct gsm_lchan *lchan, struct bts_ul_meas *ulm, uint32_t fn)</span><br><span> {</span><br><span> uint32_t fn_missed_end;</span><br><span> bool missed_end;</span><br><span> </span><br><span> lchan_new_ul_meas(lchan, ulm, fn);</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_meas_check_compute(lchan, fn);</span><br><span style="color: hsl(120, 100%, 40%);">+ return lchan_meas_check_compute(lchan, fn);</span><br><span> }</span><br><span> </span><br><span> /* Reset all measurement related struct members to their initial values. This</span><br><span>diff --git a/tests/meas/meas_test.c b/tests/meas/meas_test.c</span><br><span>index 8f50479..d4f3fe6 100644</span><br><span>--- a/tests/meas/meas_test.c</span><br><span>+++ b/tests/meas/meas_test.c</span><br><span>@@ -315,6 +315,7 @@</span><br><span> unsigned int fn = 0;</span><br><span> unsigned int fn104;</span><br><span> struct bts_ul_meas ulm;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span> </span><br><span> printf("\n\n");</span><br><span> printf("===========================================================\n");</span><br><span>@@ -347,7 +348,8 @@</span><br><span> if (dropouts == false || i % 4) {</span><br><span> if (ulm.is_sub == 1)</span><br><span> printf("(now adding SUB measurement sample %u)\n", fn);</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_meas_process_measurement(lchan, &ulm, fn);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = lchan_meas_process_measurement(lchan, &ulm, fn);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(rc == 0);</span><br><span> } else if (ulm.is_sub == 1)</span><br><span> printf("(leaving out SUB measurement sample for frame number %u)\n", fn);</span><br><span> else</span><br><span>@@ -363,7 +365,8 @@</span><br><span> if (fn % 104 == 39 && no_sacch == false) {</span><br><span> printf("(now adding SUB measurement sample for SACCH block at frame number %u)\n", fn);</span><br><span> ulm.is_sub = 1;</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_meas_process_measurement(lchan, &ulm, fn - 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = lchan_meas_process_measurement(lchan, &ulm, fn - 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(rc);</span><br><span> } else if (fn % 104 == 39 && no_sacch == true)</span><br><span> printf("(leaving out SUB measurement sample for SACCH block at frame number %u)\n", fn);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10815">change 10815</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/10815"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I9e00ce683e8c44528804f65181dbfed9e85e3aed </div>
<div style="display:none"> Gerrit-Change-Number: 10815 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>