<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/19846">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;">lapd_test: fix: print all messages to stdout, not stderr<br><br>We intentionally do not match stderr output because it contains<br>non-deterministic messages (e.g. pointer addresses), so let's<br>make sure that all test specific messages go to stdout.<br><br>Change-Id: Ia52f8e811cee9d3e1cd5fcda49a9134ccaa31f7f<br>---<br>M tests/lapd/lapd_test.c<br>M tests/lapd/lapd_test.ok<br>2 files changed, 38 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/lapd/lapd_test.c b/tests/lapd/lapd_test.c</span><br><span>index f1659ef..3ea2706 100644</span><br><span>--- a/tests/lapd/lapd_test.c</span><br><span>+++ b/tests/lapd/lapd_test.c</span><br><span>@@ -306,8 +306,8 @@</span><br><span> /* Take message from queue */</span><br><span> rc = lapdm_phsap_dequeue_prim(le, pp);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "dequeue: got rc %d: %s\n", rc,</span><br><span style="color: hsl(0, 100%, 40%);">- rc <= 0 ? strerror(-rc) : "-");</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("lapdm_phsap_dequeue_prim(): got rc %d: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ rc, rc <= 0 ? strerror(-rc) : "-");</span><br><span> </span><br><span> if (rc < 0)</span><br><span> return rc;</span><br><span>@@ -317,15 +317,14 @@</span><br><span> l3_len = msgb_l3len(pp->oph.msg);</span><br><span> l2_header_len -= l3_len;</span><br><span> } else</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "MSGB: L3 is undefined\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("MSGB: L3 is undefined\n");</span><br><span> </span><br><span> if (l2_header_len < 0 || l2_header_len > pp->oph.msg->data_len) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr,</span><br><span style="color: hsl(0, 100%, 40%);">- "MSGB inconsistent: data = %p, l2 = %p, l3 = %p, tail = %p\n",</span><br><span style="color: hsl(0, 100%, 40%);">- pp->oph.msg->data,</span><br><span style="color: hsl(0, 100%, 40%);">- pp->oph.msg->l2h,</span><br><span style="color: hsl(0, 100%, 40%);">- pp->oph.msg->l3h,</span><br><span style="color: hsl(0, 100%, 40%);">- pp->oph.msg->tail);</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("MSGB inconsistent: data = %p, l2 = %p, l3 = %p, tail = %p\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ pp->oph.msg->data,</span><br><span style="color: hsl(120, 100%, 40%);">+ pp->oph.msg->l2h,</span><br><span style="color: hsl(120, 100%, 40%);">+ pp->oph.msg->l3h,</span><br><span style="color: hsl(120, 100%, 40%);">+ pp->oph.msg->tail);</span><br><span> l2_header_len = -1;</span><br><span> }</span><br><span> </span><br><span>@@ -571,7 +570,8 @@</span><br><span> /* Send the establish request */</span><br><span> msg = create_est_req(est_req, est_req_size);</span><br><span> rc = lapdm_rslms_recvmsg(msg, &bts_to_ms_channel);</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "recvmsg: got rc %d: %s\n", rc, rc <= 0 ? strerror(-rc) : "???");</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("lapdm_rslms_recvmsg(): got rc %d: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ rc, rc <= 0 ? strerror(-rc) : "???");</span><br><span> OSMO_ASSERT(rc == 0);</span><br><span> </span><br><span> /* Take message from queue */</span><br><span>diff --git a/tests/lapd/lapd_test.ok b/tests/lapd/lapd_test.ok</span><br><span>index 835ca2b..16f6fc3 100644</span><br><span>--- a/tests/lapd/lapd_test.ok</span><br><span>+++ b/tests/lapd/lapd_test.ok</span><br><span>@@ -5,39 +5,58 @@</span><br><span> BTS: Verifying CM request.</span><br><span> </span><br><span> Confirming</span><br><span style="color: hsl(120, 100%, 40%);">+lapdm_phsap_dequeue_prim(): got rc 0: Success</span><br><span> Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x00</span><br><span> Message: [L2]> 01 73 41 [L3]> 05 24 31 03 50 18 93 08 29 47 80 00 00 00 00 80 2b 2b 2b 2b </span><br><span> ms_to_bts_tx_cb: BTS->MS(us) message 6</span><br><span> MS: Verifying incoming primitive.</span><br><span> </span><br><span> Sending back to MS</span><br><span style="color: hsl(120, 100%, 40%);">+lapdm_phsap_dequeue_prim(): got rc 0: Success</span><br><span> Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x00</span><br><span> Message: [L2]> 03 00 0d [L3]> 05 04 0d 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b </span><br><span> ms_to_bts_tx_cb: BTS->MS(us) message 12</span><br><span> MS: Verifying incoming MM message: 3</span><br><span> ms_to_bts_l1_cb: MS(us) -> BTS prim message</span><br><span style="color: hsl(120, 100%, 40%);">+lapdm_phsap_dequeue_prim(): got rc -19: No such device</span><br><span> </span><br><span> Sending back to BTS</span><br><span> ms_to_bts_l1_cb: MS(us) -> BTS prim message</span><br><span> bts_to_ms_tx_cb: MS->BTS(us) message 14</span><br><span> BTS: Verifying dummy message.</span><br><span style="color: hsl(120, 100%, 40%);">+lapdm_phsap_dequeue_prim(): got rc 0: Success</span><br><span style="color: hsl(120, 100%, 40%);">+MSGB: L3 is undefined</span><br><span> Took message from DCCH queue: L2 header size 23, L3 size 0, SAP 0x1000000, 0/0, Link 0x00</span><br><span> Message: [L2]> 01 21 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b </span><br><span style="color: hsl(120, 100%, 40%);">+lapdm_phsap_dequeue_prim(): got rc -19: No such device</span><br><span style="color: hsl(120, 100%, 40%);">+lapdm_phsap_dequeue_prim(): got rc -19: No such device</span><br><span> I test RF channel release of an unestablished channel.</span><br><span> I test contention resultion by having two mobiles collide and first mobile repeating SABM.</span><br><span> bts_to_ms_tx_cb: MS->BTS(us) message 25</span><br><span> BTS: Verifying CM request.</span><br><span style="color: hsl(120, 100%, 40%);">+lapdm_phsap_dequeue_prim(): got rc 0: Success</span><br><span> Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x00</span><br><span> Message: [L2]> 01 73 41 [L3]> 05 24 31 03 50 18 93 08 29 47 80 00 00 00 00 80 2b 2b 2b 2b </span><br><span style="color: hsl(120, 100%, 40%);">+lapdm_phsap_dequeue_prim(): got rc -19: No such device</span><br><span style="color: hsl(120, 100%, 40%);">+lapdm_phsap_dequeue_prim(): got rc 0: Success</span><br><span> Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x00</span><br><span> Message: [L2]> 01 73 41 [L3]> 05 24 31 03 50 18 93 08 29 47 80 00 00 00 00 80 2b 2b 2b 2b </span><br><span> I test RF channel establishment.</span><br><span> Testing SAPI3/SDCCH</span><br><span style="color: hsl(120, 100%, 40%);">+lapdm_rslms_recvmsg(): got rc 0: Success</span><br><span style="color: hsl(120, 100%, 40%);">+lapdm_phsap_dequeue_prim(): got rc 0: Success</span><br><span> Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x03</span><br><span> Message: [L2]> 0f 3f 01 [L3]> 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b </span><br><span style="color: hsl(120, 100%, 40%);">+lapdm_phsap_dequeue_prim(): got rc -19: No such device</span><br><span style="color: hsl(120, 100%, 40%);">+lapdm_phsap_dequeue_prim(): got rc -19: No such device</span><br><span> Testing SAPI3/SACCH</span><br><span style="color: hsl(120, 100%, 40%);">+lapdm_rslms_recvmsg(): got rc 0: Success</span><br><span style="color: hsl(120, 100%, 40%);">+lapdm_phsap_dequeue_prim(): got rc -19: No such device</span><br><span style="color: hsl(120, 100%, 40%);">+lapdm_phsap_dequeue_prim(): got rc 0: Success</span><br><span> Took message from ACCH queue: L2 header size 5, L3 size 18, SAP 0x1000000, 0/0, Link 0x43</span><br><span> Message: [L2]> 00 00 0f 3f 01 [L3]> 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b </span><br><span style="color: hsl(120, 100%, 40%);">+lapdm_phsap_dequeue_prim(): got rc -19: No such device</span><br><span style="color: hsl(120, 100%, 40%);">+lapdm_phsap_dequeue_prim(): got rc -19: No such device</span><br><span> I test if desync problems exist in LAPDm</span><br><span> </span><br><span> Establishing SAPI=0</span><br><span>@@ -46,6 +65,7 @@</span><br><span> Dumping queue:</span><br><span> 00 00 17 [L2]> 01 73 41 [L3]> 05 24 31 03 50 18 93 08 29 47 80 00 00 00 00 80 </span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+lapdm_phsap_dequeue_prim(): got rc 0: Success</span><br><span> Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x00</span><br><span> Message: [L2]> 01 73 41 [L3]> 05 24 31 03 50 18 93 08 29 47 80 00 00 00 00 80 2b 2b 2b 2b </span><br><span> </span><br><span>@@ -55,6 +75,8 @@</span><br><span> Dumping queue:</span><br><span> 00 00 17 [L2]> 01 21 01 </span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+lapdm_phsap_dequeue_prim(): got rc 0: Success</span><br><span style="color: hsl(120, 100%, 40%);">+MSGB: L3 is undefined</span><br><span> Took message from DCCH queue: L2 header size 23, L3 size 0, SAP 0x1000000, 0/0, Link 0x00</span><br><span> Message: [L2]> 01 21 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b </span><br><span> </span><br><span>@@ -70,6 +92,7 @@</span><br><span> Dumping queue:</span><br><span> 00 00 17 [L2]> 03 40 0d [L3]> 06 35 01 </span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+lapdm_phsap_dequeue_prim(): got rc 0: Success</span><br><span> Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x00</span><br><span> Message: [L2]> 03 40 0d [L3]> 06 35 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b </span><br><span> </span><br><span>@@ -79,6 +102,8 @@</span><br><span> Dumping queue:</span><br><span> 00 00 17 [L2]> 01 61 01 </span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+lapdm_phsap_dequeue_prim(): got rc 0: Success</span><br><span style="color: hsl(120, 100%, 40%);">+MSGB: L3 is undefined</span><br><span> Took message from DCCH queue: L2 header size 23, L3 size 0, SAP 0x1000000, 0/0, Link 0x00</span><br><span> Message: [L2]> 01 61 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b </span><br><span> </span><br><span>@@ -87,6 +112,7 @@</span><br><span> </span><br><span> Dumping queue:</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+lapdm_phsap_dequeue_prim(): got rc 0: Success</span><br><span> Took message from DCCH queue: L2 header size 3, L3 size 20, SAP 0x1000000, 0/0, Link 0x03</span><br><span> Message: [L2]> 0d 73 01 [L3]> 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b </span><br><span> </span><br><span>@@ -94,6 +120,8 @@</span><br><span> </span><br><span> Dumping queue:</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+lapdm_phsap_dequeue_prim(): got rc 0: Success</span><br><span style="color: hsl(120, 100%, 40%);">+MSGB: L3 is undefined</span><br><span> Took message from DCCH queue: L2 header size 23, L3 size 0, SAP 0x1000000, 0/0, Link 0x03</span><br><span> Message: [L2]> 0d 21 01 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b </span><br><span> Success.</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/19846">change 19846</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/libosmocore/+/19846"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ia52f8e811cee9d3e1cd5fcda49a9134ccaa31f7f </div>
<div style="display:none"> Gerrit-Change-Number: 19846 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@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-MessageType: merged </div>