<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/14357">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">db_sms_test: Do not print exact memcmp result<br><br>man memcp doesn't define exact values for returned integer, it only<br>specifices a meaning for the sign of it.<br>So it happens that different versions/implementations actually return<br>different values when this test is run, making it fail.<br>Let's simply verify only the sign of the returned value.<br><br>Change-Id: I771fb8f4fc56f337b16561d005ff1803a386d1c6<br>---<br>M tests/db_sms/db_sms_test.c<br>M tests/db_sms/db_sms_test.ok<br>2 files changed, 11 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/57/14357/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/db_sms/db_sms_test.c b/tests/db_sms/db_sms_test.c</span><br><span>index a97f7c7..a204ab1 100644</span><br><span>--- a/tests/db_sms/db_sms_test.c</span><br><span>+++ b/tests/db_sms/db_sms_test.c</span><br><span>@@ -358,7 +358,7 @@</span><br><span> sizeof(sms->user_data));</span><br><span> if (rc) {</span><br><span> LOGPC(DDB, LOGL_ERROR, "TP-User-Data mismatch (diff=%d/%zu)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- rc, sizeof(sms->user_data));</span><br><span style="color: hsl(120, 100%, 40%);">+ rc > 0 ? 1 : -1, sizeof(sms->user_data));</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span>@@ -366,7 +366,7 @@</span><br><span> rc = strncmp(sms->text, test->sms.text, sizeof(sms->text));</span><br><span> if (rc) {</span><br><span> LOGPC(DDB, LOGL_ERROR, "TP-User-Data (text) mismatch (diff=%d/%zu)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- rc, sizeof(sms->text));</span><br><span style="color: hsl(120, 100%, 40%);">+ rc > 0 ? 1 : -1, sizeof(sms->text));</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span>diff --git a/tests/db_sms/db_sms_test.ok b/tests/db_sms/db_sms_test.ok</span><br><span>index e0a329d..4722a92 100644</span><br><span>--- a/tests/db_sms/db_sms_test.ok</span><br><span>+++ b/tests/db_sms/db_sms_test.ok</span><br><span>@@ -18,15 +18,15 @@</span><br><span> DDB NOTICE test_db_sms_get('Regular MT SMS'): success, as expected</span><br><span> DDB NOTICE verify_sms('Regular MT SMS'): match</span><br><span> DDB NOTICE test_db_sms_get('Complete TP-UD (160 septets, 7-bit encoding)'): success, as expected</span><br><span style="color: hsl(0, 100%, 40%);">-DDB NOTICE verify_sms('Complete TP-UD (160 septets, 7-bit encoding)'): TP-User-Data mismatch (diff=-65/256)</span><br><span style="color: hsl(120, 100%, 40%);">+DDB NOTICE verify_sms('Complete TP-UD (160 septets, 7-bit encoding)'): TP-User-Data mismatch (diff=-1/256)</span><br><span> DDB NOTICE test_db_sms_get('Complete TP-UD (140 octets, 8-bit encoding)'): success, as expected</span><br><span style="color: hsl(0, 100%, 40%);">-DDB NOTICE verify_sms('Complete TP-UD (140 octets, 8-bit encoding)'): TP-User-Data mismatch (diff=-66/256)</span><br><span style="color: hsl(120, 100%, 40%);">+DDB NOTICE verify_sms('Complete TP-UD (140 octets, 8-bit encoding)'): TP-User-Data mismatch (diff=-1/256)</span><br><span> DDB NOTICE test_db_sms_get('TP-UD buffer overflow (UDH-Length > UD-Length)'): success, as expected</span><br><span> DDB NOTICE verify_sms('TP-UD buffer overflow (UDH-Length > UD-Length)'): match</span><br><span> DDB NOTICE test_db_sms_get('Truncated TP-UD (200 septets, 7-bit encoding)'): success, as expected</span><br><span style="color: hsl(0, 100%, 40%);">-DDB NOTICE verify_sms('Truncated TP-UD (200 septets, 7-bit encoding)'): TP-User-Data mismatch (diff=-65/256)</span><br><span style="color: hsl(120, 100%, 40%);">+DDB NOTICE verify_sms('Truncated TP-UD (200 septets, 7-bit encoding)'): TP-User-Data mismatch (diff=-1/256)</span><br><span> DDB NOTICE test_db_sms_get('Truncated TP-UD (255 octets, 8-bit encoding)'): success, as expected</span><br><span style="color: hsl(0, 100%, 40%);">-DDB NOTICE verify_sms('Truncated TP-UD (255 octets, 8-bit encoding)'): TP-User-Data mismatch (diff=-16896/256)</span><br><span style="color: hsl(120, 100%, 40%);">+DDB NOTICE verify_sms('Truncated TP-UD (255 octets, 8-bit encoding)'): TP-User-Data mismatch (diff=-1/256)</span><br><span> DDB NOTICE test_db_sms_get('Same MSISDN #1'): success, as expected</span><br><span> DDB NOTICE verify_sms('Same MSISDN #1'): match</span><br><span> DDB NOTICE test_db_sms_get('Same MSISDN #2'): success, as expected</span><br><span>@@ -43,7 +43,7 @@</span><br><span> DDB DEBUG Marking #1 as delivered: rc=0</span><br><span> DDB DEBUG Marking #2 as delivered: rc=0</span><br><span> DDB NOTICE db_sms_get_next_unsent(starting from #1): found</span><br><span style="color: hsl(0, 100%, 40%);">-DDB NOTICE verify_sms('Complete TP-UD (160 septets, 7-bit encoding)'): TP-User-Data mismatch (diff=-65/256)</span><br><span style="color: hsl(120, 100%, 40%);">+DDB NOTICE verify_sms('Complete TP-UD (160 septets, 7-bit encoding)'): TP-User-Data mismatch (diff=-1/256)</span><br><span> DDB INFO Testing db_sms_delete_sent_message_by_id()...</span><br><span> DDB NOTICE db_sms_delete_sent_message_by_id(#1, sent): rc=0</span><br><span> DDB NOTICE db_sms_delete_sent_message_by_id(#3, not sent): rc=0</span><br><span>@@ -57,15 +57,15 @@</span><br><span> DDB NOTICE test_db_sms_get('Regular MT SMS'): success, as expected</span><br><span> DDB NOTICE verify_sms('Regular MT SMS'): match</span><br><span> DDB NOTICE test_db_sms_get('Complete TP-UD (160 septets, 7-bit encoding)'): success, as expected</span><br><span style="color: hsl(0, 100%, 40%);">-DDB NOTICE verify_sms('Complete TP-UD (160 septets, 7-bit encoding)'): TP-User-Data mismatch (diff=-65/256)</span><br><span style="color: hsl(120, 100%, 40%);">+DDB NOTICE verify_sms('Complete TP-UD (160 septets, 7-bit encoding)'): TP-User-Data mismatch (diff=-1/256)</span><br><span> DDB NOTICE test_db_sms_get('Complete TP-UD (140 octets, 8-bit encoding)'): success, as expected</span><br><span style="color: hsl(0, 100%, 40%);">-DDB NOTICE verify_sms('Complete TP-UD (140 octets, 8-bit encoding)'): TP-User-Data mismatch (diff=-66/256)</span><br><span style="color: hsl(120, 100%, 40%);">+DDB NOTICE verify_sms('Complete TP-UD (140 octets, 8-bit encoding)'): TP-User-Data mismatch (diff=-1/256)</span><br><span> DDB NOTICE test_db_sms_get('TP-UD buffer overflow (UDH-Length > UD-Length)'): success, as expected</span><br><span> DDB NOTICE verify_sms('TP-UD buffer overflow (UDH-Length > UD-Length)'): match</span><br><span> DDB NOTICE test_db_sms_get('Truncated TP-UD (200 septets, 7-bit encoding)'): success, as expected</span><br><span style="color: hsl(0, 100%, 40%);">-DDB NOTICE verify_sms('Truncated TP-UD (200 septets, 7-bit encoding)'): TP-User-Data mismatch (diff=-65/256)</span><br><span style="color: hsl(120, 100%, 40%);">+DDB NOTICE verify_sms('Truncated TP-UD (200 septets, 7-bit encoding)'): TP-User-Data mismatch (diff=-1/256)</span><br><span> DDB NOTICE test_db_sms_get('Truncated TP-UD (255 octets, 8-bit encoding)'): success, as expected</span><br><span style="color: hsl(0, 100%, 40%);">-DDB NOTICE verify_sms('Truncated TP-UD (255 octets, 8-bit encoding)'): TP-User-Data mismatch (diff=-16896/256)</span><br><span style="color: hsl(120, 100%, 40%);">+DDB NOTICE verify_sms('Truncated TP-UD (255 octets, 8-bit encoding)'): TP-User-Data mismatch (diff=-1/256)</span><br><span> DDB NOTICE test_db_sms_get('Same MSISDN #1'): failure, as expected</span><br><span> DDB NOTICE test_db_sms_get('Same MSISDN #2'): failure, as expected</span><br><span> DDB NOTICE test_db_sms_get('Expired SMS'): unexpected result</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/14357">change 14357</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-msc/+/14357"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I771fb8f4fc56f337b16561d005ff1803a386d1c6 </div>
<div style="display:none"> Gerrit-Change-Number: 14357 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>