<p>osmith <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/15564">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tests/app_info: fix compiling with older g++<br><br>Do not use C++11 extended initializers to prevent the following error.<br><br>AppInfoTest.cpp:109:54: error: extended initializer lists only available with -std=c++11 or -std=gnu++11<br> pcu_prim.u.app_info_req = {0, 15, {0xff, 0x00, 0xff}};<br><br>I ran into this when modifying the gerrit build verification job to<br>build with docker (which still uses GCC-4.9).<br><br>Related: OS#4204<br>Change-Id: I307cd87af88e86804a90d6466e9cc3909bfe701f<br>---<br>M tests/app_info/AppInfoTest.cpp<br>1 file changed, 17 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/app_info/AppInfoTest.cpp b/tests/app_info/AppInfoTest.cpp</span><br><span>index c4cf548..ca2c59e 100644</span><br><span>--- a/tests/app_info/AppInfoTest.cpp</span><br><span>+++ b/tests/app_info/AppInfoTest.cpp</span><br><span>@@ -47,14 +47,14 @@</span><br><span> fprintf(stderr, "\n");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void test_enc() {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_pcu_if_app_info_req req = {0, 15, {0xff, 0x00, 0xff}};</span><br><span style="color: hsl(120, 100%, 40%);">+void test_enc(const struct gsm_pcu_if_app_info_req *req)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span> const char *exp = "03 fc 03 fc 00 00 00 00 00 00 00 00 00 00 00 00 "; /* shifted by two bits to the right */</span><br><span> struct msgb *msg;</span><br><span> char *msg_dump;</span><br><span> </span><br><span> fprintf(stderr, "--- %s ---\n", __func__);</span><br><span style="color: hsl(0, 100%, 40%);">- msg = gprs_rlcmac_app_info_msg(&req);</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = gprs_rlcmac_app_info_msg(req);</span><br><span> msg_dump = msgb_hexdump_c(tall_pcu_ctx, msg);</span><br><span> </span><br><span> fprintf(stderr, "exp: %s\n", exp);</span><br><span>@@ -100,13 +100,13 @@</span><br><span> fprintf(stderr, "\n");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void test_sched_app_info_ok()</span><br><span style="color: hsl(120, 100%, 40%);">+void test_sched_app_info_ok(const struct gsm_pcu_if_app_info_req *req)</span><br><span> {</span><br><span> struct gsm_pcu_if pcu_prim = {PCU_IF_MSG_APP_INFO_REQ, };</span><br><span> struct msgb *msg;</span><br><span> </span><br><span> fprintf(stderr, "--- %s ---\n", __func__);</span><br><span style="color: hsl(0, 100%, 40%);">- pcu_prim.u.app_info_req = {0, 15, {0xff, 0x00, 0xff}};</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_prim.u.app_info_req = *req;</span><br><span> pcu_rx(PCU_IF_MSG_APP_INFO_REQ, &pcu_prim);</span><br><span> </span><br><span> msg = sched_app_info(tbf1);</span><br><span>@@ -120,13 +120,13 @@</span><br><span> fprintf(stderr, "\n");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void test_sched_app_info_missing_app_info_in_bts()</span><br><span style="color: hsl(120, 100%, 40%);">+void test_sched_app_info_missing_app_info_in_bts(const struct gsm_pcu_if_app_info_req *req)</span><br><span> {</span><br><span> struct gprs_rlcmac_bts *bts_data = BTS::main_bts()->bts_data();</span><br><span> struct gsm_pcu_if pcu_prim = {PCU_IF_MSG_APP_INFO_REQ, };</span><br><span> </span><br><span> fprintf(stderr, "--- %s ---\n", __func__);</span><br><span style="color: hsl(0, 100%, 40%);">- pcu_prim.u.app_info_req = {0, 15, {0xff, 0x00, 0xff}};</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_prim.u.app_info_req = *req;</span><br><span> pcu_rx(PCU_IF_MSG_APP_INFO_REQ, &pcu_prim);</span><br><span> </span><br><span> msgb_free(bts_data->app_info);</span><br><span>@@ -137,12 +137,12 @@</span><br><span> fprintf(stderr, "\n");</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void test_pcu_rx_overwrite_app_info()</span><br><span style="color: hsl(120, 100%, 40%);">+void test_pcu_rx_overwrite_app_info(const struct gsm_pcu_if_app_info_req *req)</span><br><span> {</span><br><span> struct gsm_pcu_if pcu_prim = {PCU_IF_MSG_APP_INFO_REQ, };</span><br><span> </span><br><span> fprintf(stderr, "--- %s ---\n", __func__);</span><br><span style="color: hsl(0, 100%, 40%);">- pcu_prim.u.app_info_req = {0, 15, {0xff, 0x00, 0xff}};</span><br><span style="color: hsl(120, 100%, 40%);">+ pcu_prim.u.app_info_req = *req;</span><br><span> pcu_rx(PCU_IF_MSG_APP_INFO_REQ, &pcu_prim);</span><br><span> pcu_rx(PCU_IF_MSG_APP_INFO_REQ, &pcu_prim);</span><br><span> fprintf(stderr, "\n");</span><br><span>@@ -162,6 +162,10 @@</span><br><span> </span><br><span> int main(int argc, char *argv[])</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_pcu_if_app_info_req req = {0, 15, {0}};</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t req_data[] = {0xff, 0x00, 0xff};</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(req.data, req_data, 3);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> tall_pcu_ctx = talloc_named_const(NULL, 1, "AppInfoTest");</span><br><span> osmo_init_logging2(tall_pcu_ctx, &gprs_log_info);</span><br><span> log_set_use_color(osmo_stderr_target, 0);</span><br><span>@@ -169,13 +173,13 @@</span><br><span> log_parse_category_mask(osmo_stderr_target, "DL1IF,1:DRLCMAC,3:DRLCMACSCHED,1");</span><br><span> </span><br><span> test_enc_zero_len();</span><br><span style="color: hsl(0, 100%, 40%);">- test_enc();</span><br><span style="color: hsl(120, 100%, 40%);">+ test_enc(&req);</span><br><span> test_pcu_rx_no_subscr_with_active_tbf();</span><br><span> </span><br><span> prepare_bts_with_two_dl_tbf_subscr();</span><br><span style="color: hsl(0, 100%, 40%);">- test_sched_app_info_ok();</span><br><span style="color: hsl(0, 100%, 40%);">- test_sched_app_info_missing_app_info_in_bts();</span><br><span style="color: hsl(0, 100%, 40%);">- test_pcu_rx_overwrite_app_info();</span><br><span style="color: hsl(120, 100%, 40%);">+ test_sched_app_info_ok(&req);</span><br><span style="color: hsl(120, 100%, 40%);">+ test_sched_app_info_missing_app_info_in_bts(&req);</span><br><span style="color: hsl(120, 100%, 40%);">+ test_pcu_rx_overwrite_app_info(&req);</span><br><span> </span><br><span> cleanup();</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/15564">change 15564</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-pcu/+/15564"/><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-Change-Id: I307cd87af88e86804a90d6466e9cc3909bfe701f </div>
<div style="display:none"> Gerrit-Change-Number: 15564 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>