<p>Max has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13132">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use msgb_eq_data_print() in tests<br><br>This allows to see exact byte which differs with expected output in case<br>of test failure.<br><br>Change-Id: If1285649b27843d68dfaa6f6dd3b80deee9aa148<br>---<br>M tests/llc/LlcTest.cpp<br>M tests/rlcmac/RLCMACTest.cpp<br>M tests/tbf/TbfTest.cpp<br>3 files changed, 43 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/32/13132/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/llc/LlcTest.cpp b/tests/llc/LlcTest.cpp</span><br><span>index 3083644..13bda3c 100644</span><br><span>--- a/tests/llc/LlcTest.cpp</span><br><span>+++ b/tests/llc/LlcTest.cpp</span><br><span>@@ -61,7 +61,6 @@</span><br><span> size_t len, const gprs_llc_queue::MetaInfo *exp_info = 0)</span><br><span> {</span><br><span> struct msgb *llc_msg;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t *msg_data;</span><br><span> const gprs_llc_queue::MetaInfo *info_res;</span><br><span> </span><br><span> llc_msg = queue->dequeue(&info_res);</span><br><span>@@ -70,10 +69,8 @@</span><br><span> fprintf(stderr, "dequeued msg, length %u (expected %zu), data %s\n",</span><br><span> msgb_length(llc_msg), len, msgb_hexdump(llc_msg));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(msgb_length(llc_msg) == len);</span><br><span style="color: hsl(0, 100%, 40%);">- msg_data = msgb_data(llc_msg);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(memcmp(msg_data, exp_data, len) == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_data_print(llc_msg, exp_data, len))</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "check failed!\n");</span><br><span> </span><br><span> if (exp_info)</span><br><span> OSMO_ASSERT(memcmp(exp_info, info_res, sizeof(*exp_info)) == 0);</span><br><span>@@ -229,7 +226,7 @@</span><br><span> log_set_use_color(osmo_stderr_target, 0);</span><br><span> log_set_print_filename(osmo_stderr_target, 0);</span><br><span> log_set_log_level(osmo_stderr_target, LOGL_INFO);</span><br><span style="color: hsl(0, 100%, 40%);">- log_parse_category_mask(osmo_stderr_target, "DPCU,3");</span><br><span style="color: hsl(120, 100%, 40%);">+ log_parse_category_mask(osmo_stderr_target, "DPCU,3:DLGLOBAL,1:");</span><br><span> </span><br><span> vty_init(&pcu_vty_info);</span><br><span> pcu_vty_init(&gprs_log_info);</span><br><span>diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp</span><br><span>index bf7a605..04d3895 100644</span><br><span>--- a/tests/rlcmac/RLCMACTest.cpp</span><br><span>+++ b/tests/rlcmac/RLCMACTest.cpp</span><br><span>@@ -33,6 +33,7 @@</span><br><span> #include <osmocom/vty/telnet_interface.h></span><br><span> #include <osmocom/vty/logging.h></span><br><span> #include <osmocom/core/utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/msgb.h></span><br><span> #include <osmocom/core/application.h></span><br><span> }</span><br><span> using namespace std;</span><br><span>@@ -216,6 +217,8 @@</span><br><span> </span><br><span> void testCsnLeftAlignedVarBmpBounds(void *test_ctx)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *m = msgb_alloc(80, "test");</span><br><span style="color: hsl(120, 100%, 40%);">+ static uint8_t exp[] = { 0x7f, 0xff, 0xff, 0xee, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };</span><br><span> bitvec *vector = bitvec_alloc(23, test_ctx);</span><br><span> </span><br><span> bitvec_unhex(vector, "40200bffd161003e0e519ffffffb800000000000000000");</span><br><span>@@ -225,14 +228,16 @@</span><br><span> &data.u.Egprs_Packet_Downlink_Ack_Nack.EGPRS_AckNack.Desc;</span><br><span> decode_gsm_rlcmac_uplink(vector, &data);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(!strcmp(osmo_hexdump(urbb->URBB, 13),</span><br><span style="color: hsl(0, 100%, 40%);">- "7f ff ff ee 00 00 00 00 00 00 00 00 00 "));</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(msgb_put(m, 13), urbb->URBB, 13);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_data_print(m, exp, 13))</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("%s failed!\n", __func__);</span><br><span> }</span><br><span> </span><br><span> int main(int argc, char *argv[])</span><br><span> {</span><br><span> void *ctx = talloc_named_const(NULL, 1, "RLCMACTest");</span><br><span> osmo_init_logging2(ctx, &gprs_log_info);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_parse_category_mask(osmo_stderr_target, "DPCU,3:DLGLOBAL,1:");</span><br><span> </span><br><span> //printSizeofRLCMAC();</span><br><span> testRlcMacDownlink(ctx);</span><br><span>diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp</span><br><span>index dfed79e..ff73d90 100644</span><br><span>--- a/tests/tbf/TbfTest.cpp</span><br><span>+++ b/tests/tbf/TbfTest.cpp</span><br><span>@@ -527,12 +527,21 @@</span><br><span> struct msgb *msg;</span><br><span> int fn = 0;</span><br><span> uint8_t expected_data = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ static uint8_t exp[][GSM_MACBLOCK_LEN] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0x07, 0x00, 0x00, 0x4d, 0x01, 0x01, 0x01,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0x07, 0x00, 0x02, 0x4d, 0x02, 0x02, 0x02,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02 },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0x07, 0x01, 0x04, 0x4d, 0x03, 0x03, 0x03,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03 },</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span> </span><br><span> while (ms->dl_tbf()->have_data()) {</span><br><span> msg = ms->dl_tbf()->create_dl_acked_block(fn += 4, 7);</span><br><span> fprintf(stderr, "MSG = %s\n", msgb_hexdump(msg));</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(msgb_length(msg) == 23);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(msgb_data(msg)[10] == expected_data);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_data_print(msg, exp[expected_data - 1], GSM_MACBLOCK_LEN))</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("%s failed at %u\n", __func__, expected_data);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> expected_data += 1;</span><br><span> }</span><br><span> OSMO_ASSERT(expected_data-1 == 3);</span><br><span>@@ -732,9 +741,14 @@</span><br><span> </span><br><span> struct msgb *msg1 = ul_tbf->create_ul_ack(*fn, ts_no);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(!strcmp(osmo_hexdump(msg1->data, msg1->data_len),</span><br><span style="color: hsl(0, 100%, 40%);">- "40 24 01 3f 3e 24 46 68 90 87 b0 06 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b "</span><br><span style="color: hsl(0, 100%, 40%);">- ));</span><br><span style="color: hsl(120, 100%, 40%);">+ static uint8_t exp1[] = { 0x40, 0x24, 0x01, 0x3f, 0x3e, 0x24, 0x46, 0x68, 0x90, 0x87, 0xb0, 0x06,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b</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%);">+ if (!msgb_eq_data_print(msg1, exp1, GSM_MACBLOCK_LEN)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("%s test failed on 1st segment!\n", __func__);</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> egprs3->si = 0;</span><br><span> egprs3->r = 1;</span><br><span>@@ -754,10 +768,14 @@</span><br><span> </span><br><span> msg1 = ul_tbf->create_ul_ack(*fn, ts_no);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(!strcmp(osmo_hexdump(msg1->data, msg1->data_len),</span><br><span style="color: hsl(0, 100%, 40%);">- "40 24 01 3f 3e 24 46 68 90 88 b0 06 8b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b "</span><br><span style="color: hsl(0, 100%, 40%);">- ));</span><br><span style="color: hsl(120, 100%, 40%);">+ static uint8_t exp2[] = { 0x40, 0x24, 0x01, 0x3f, 0x3e, 0x24, 0x46, 0x68, 0x90, 0x88, 0xb0, 0x06, 0x8b,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_data_print(msg1, exp2, GSM_MACBLOCK_LEN)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("%s test failed on 2nd segment!\n", __func__);</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> return ul_tbf;</span><br><span> }</span><br><span> </span><br><span>@@ -3205,6 +3223,10 @@</span><br><span> {</span><br><span> BTS the_bts;</span><br><span> uint32_t tlli = 0xffeeddcc;</span><br><span style="color: hsl(120, 100%, 40%);">+ static uint8_t exp[] = { 0x40, 0x84, 0x7f, 0xf7, 0x6e, 0xe6, 0x41, 0x4b,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b,</span><br><span style="color: hsl(120, 100%, 40%);">+ 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span> </span><br><span> printf("=== start %s ===\n", __func__);</span><br><span> setup_bts(&the_bts, 4);</span><br><span>@@ -3217,8 +3239,9 @@</span><br><span> printf("packet reject: %s\n",</span><br><span> osmo_hexdump(msg->data, 23));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(!strcmp(osmo_hexdump(msg->data, 23),</span><br><span style="color: hsl(0, 100%, 40%);">- "40 84 7f f7 6e e6 41 4b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b 2b "));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msgb_eq_data_print(msg, exp, GSM_MACBLOCK_LEN))</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("%s test failed!\n", __func__);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> printf("=== end %s ===\n", __func__);</span><br><span> </span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13132">change 13132</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/13132"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: If1285649b27843d68dfaa6f6dd3b80deee9aa148 </div>
<div style="display:none"> Gerrit-Change-Number: 13132 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>