<p>neels <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24001">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fix test_gsm48_multirate_config: dump the complete AMR lv buffer<br><br>It's acceptable to verify an outcome by printing to an expected output.<br>It's unacceptable to commit those expected outputs without first<br>verifying that they are in fact correct!<br><br>In this case, the output has obviously not been even read, since the<br>length byte clearly indicates that one byte is missing from each buffer<br>dump.<br><br>I have now verified by hand against 3GPP TS 44.018 that each one of the<br>generated octets are indeed correct.<br><br>Change-Id: I92fcc7afe018a4a8dc91f0f2167e3a7835f623c9<br>---<br>M tests/gsm0408/gsm0408_test.c<br>M tests/gsm0408/gsm0408_test.ok<br>2 files changed, 8 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c</span><br><span>index 7545381..9a1d3cf 100644</span><br><span>--- a/tests/gsm0408/gsm0408_test.c</span><br><span>+++ b/tests/gsm0408/gsm0408_test.c</span><br><span>@@ -810,7 +810,7 @@</span><br><span> rc = gsm48_multirate_config(lv, gsm48_ie, mr.ms_mode, 4);</span><br><span> OSMO_ASSERT(rc == 0);</span><br><span> printf("gsm48_multirate_config(): rc=%i, lv=%s\n", rc,</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_hexdump_nospc(lv, lv[0]));</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_hexdump_nospc(lv, 1 + lv[0]));</span><br><span> </span><br><span> /* Test #2: 4 active set members, but wrong mode order: */</span><br><span> mr.ms_mode[3].mode = 2;</span><br><span>@@ -832,7 +832,7 @@</span><br><span> rc = gsm48_multirate_config(lv, gsm48_ie, mr.ms_mode, 3);</span><br><span> OSMO_ASSERT(rc == 0);</span><br><span> printf("gsm48_multirate_config(): rc=%i, lv=%s\n", rc,</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_hexdump_nospc(lv, lv[0]));</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_hexdump_nospc(lv, 1 + lv[0]));</span><br><span> </span><br><span> /* Test #4: 3 active set members, but wrong mode order: */</span><br><span> mr.ms_mode[0].mode = 2;</span><br><span>@@ -852,7 +852,7 @@</span><br><span> rc = gsm48_multirate_config(lv, gsm48_ie, mr.ms_mode, 2);</span><br><span> OSMO_ASSERT(rc == 0);</span><br><span> printf("gsm48_multirate_config(): rc=%i, lv=%s\n", rc,</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_hexdump_nospc(lv, lv[0]));</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_hexdump_nospc(lv, 1 + lv[0]));</span><br><span> </span><br><span> /* Test #6: 2 active set members, but wrong mode order: */</span><br><span> mr.ms_mode[1].mode = 2;</span><br><span>@@ -870,7 +870,7 @@</span><br><span> rc = gsm48_multirate_config(lv, gsm48_ie, mr.ms_mode, 1);</span><br><span> OSMO_ASSERT(rc == 0);</span><br><span> printf("gsm48_multirate_config(): rc=%i, lv=%s\n", rc,</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_hexdump_nospc(lv, lv[0]));</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_hexdump_nospc(lv, 1 + lv[0]));</span><br><span> </span><br><span> /* Test #8: 0 active set members: */</span><br><span> mr.ms_mode[0].mode = 0;</span><br><span>diff --git a/tests/gsm0408/gsm0408_test.ok b/tests/gsm0408/gsm0408_test.ok</span><br><span>index 7e054f4..f1aa463 100644</span><br><span>--- a/tests/gsm0408/gsm0408_test.ok</span><br><span>+++ b/tests/gsm0408/gsm0408_test.ok</span><br><span>@@ -239,8 +239,8 @@</span><br><span> test_gsm48_ra_id_by_bts[4]: digits='999999' lac=0xffff=htons(65535) rac=0xff=255 pass</span><br><span> test_gsm48_ra_id_by_bts[5]: digits='09f909' lac=0xcdab=htons(43981) rac=0xab=171 pass</span><br><span> test_gsm48_ra_id_by_bts[6]: digits='090990' lac=0xcdab=htons(43981) rac=0xab=171 pass</span><br><span style="color: hsl(0, 100%, 40%);">-gsm48_multirate_config(): rc=0, lv=0620b40bf330</span><br><span style="color: hsl(0, 100%, 40%);">-gsm48_multirate_config(): rc=0, lv=0520340bf3</span><br><span style="color: hsl(0, 100%, 40%);">-gsm48_multirate_config(): rc=0, lv=0420140b</span><br><span style="color: hsl(0, 100%, 40%);">-gsm48_multirate_config(): rc=0, lv=0220</span><br><span style="color: hsl(120, 100%, 40%);">+gsm48_multirate_config(): rc=0, lv=0620b40bf330d8</span><br><span style="color: hsl(120, 100%, 40%);">+gsm48_multirate_config(): rc=0, lv=0520340bf330</span><br><span style="color: hsl(120, 100%, 40%);">+gsm48_multirate_config(): rc=0, lv=0420140bf0</span><br><span style="color: hsl(120, 100%, 40%);">+gsm48_multirate_config(): rc=0, lv=022004</span><br><span> Done.</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24001">change 24001</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/c/osmo-bsc/+/24001"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I92fcc7afe018a4a8dc91f0f2167e3a7835f623c9 </div>
<div style="display:none"> Gerrit-Change-Number: 24001 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>