<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-iuh/+/18342">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Fix OneDefinitionRule Asan violation in tests and osmo-hnbgw<br><br>With new gcc 10.1.0, tests failed at runtime when built with ASAN<br>enabled, since some global variables where defined multiple times.<br>See OS#4556 for a sample Asan error.<br><br>Fixes: OS#4556<br>Change-Id: I12a667ea8a9f16404c13c9218b246d2e3acfe3e8<br>---<br>M src/hnbap_common.c<br>M src/tests/dummy_cn_sua.c<br>M src/tests/test-helpers.c<br>M src/tests/test-ranap.c<br>M src/tests/test_common.c<br>5 files changed, 6 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/hnbap_common.c b/src/hnbap_common.c</span><br><span>index f8cfb13..4e79467 100644</span><br><span>--- a/src/hnbap_common.c</span><br><span>+++ b/src/hnbap_common.c</span><br><span>@@ -106,10 +106,6 @@</span><br><span> return buf;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int asn_debug = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-int asn1_xer_print = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static struct msgb *hnbap_msgb_alloc(void)</span><br><span> {</span><br><span> return msgb_alloc(1024, "HNBAP Tx");</span><br><span>diff --git a/src/tests/dummy_cn_sua.c b/src/tests/dummy_cn_sua.c</span><br><span>index aba6c8a..6e14562 100644</span><br><span>--- a/src/tests/dummy_cn_sua.c</span><br><span>+++ b/src/tests/dummy_cn_sua.c</span><br><span>@@ -26,7 +26,6 @@</span><br><span> #include <osmocom/ranap/ranap_msg_factory.h></span><br><span> #include <osmocom/iuh/hnbgw.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int asn1_xer_print = 1;</span><br><span> const char *cmdline_bind_addr = "127.0.0.1";</span><br><span> </span><br><span> struct ue_conn_ctx {</span><br><span>@@ -364,6 +363,8 @@</span><br><span> int rc;</span><br><span> int port = 14001;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ asn1_xer_print = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> osmo_sua_set_log_area(DSUA);</span><br><span> ranap_set_log_area(DRANAP);</span><br><span> </span><br><span>diff --git a/src/tests/test-helpers.c b/src/tests/test-helpers.c</span><br><span>index aafe815..cfe2140 100644</span><br><span>--- a/src/tests/test-helpers.c</span><br><span>+++ b/src/tests/test-helpers.c</span><br><span>@@ -32,7 +32,6 @@</span><br><span> </span><br><span> #include <osmocom/ranap/RANAP_LAI.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int asn1_xer_print = 0;</span><br><span> extern void *talloc_asn1_ctx;</span><br><span> </span><br><span> /* use odd number of digits */</span><br><span>@@ -207,6 +206,8 @@</span><br><span> </span><br><span> int main(int argc, char **argv)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ asn1_xer_print = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> test_common_init();</span><br><span> </span><br><span> test_iu_helpers();</span><br><span>diff --git a/src/tests/test-ranap.c b/src/tests/test-ranap.c</span><br><span>index efa2241..a6df186 100644</span><br><span>--- a/src/tests/test-ranap.c</span><br><span>+++ b/src/tests/test-ranap.c</span><br><span>@@ -34,8 +34,6 @@</span><br><span> </span><br><span> #include <osmocom/iuh/hnbgw.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int asn1_xer_print = 1;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> extern void *tall_msgb_ctx;</span><br><span> </span><br><span> static void test_aper_int(uint32_t inp)</span><br><span>@@ -95,6 +93,8 @@</span><br><span> uint8_t ck[16] = { 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 };</span><br><span> int i;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ asn1_xer_print = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> //asn_debug = 1;</span><br><span> </span><br><span> test_common_init();</span><br><span>diff --git a/src/tests/test_common.c b/src/tests/test_common.c</span><br><span>index 701d581..7c6f62a 100644</span><br><span>--- a/src/tests/test_common.c</span><br><span>+++ b/src/tests/test_common.c</span><br><span>@@ -41,8 +41,6 @@</span><br><span> </span><br><span> #include <osmocom/iuh/hnbgw.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void *talloc_asn1_ctx;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static const struct log_info_cat log_cat[] = {</span><br><span> [DMAIN] = {</span><br><span> .name = "DMAIN", .loglevel = LOGL_INFO, .enabled = 1,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-iuh/+/18342">change 18342</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-iuh/+/18342"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-iuh </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I12a667ea8a9f16404c13c9218b246d2e3acfe3e8 </div>
<div style="display:none"> Gerrit-Change-Number: 18342 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@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>