<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/22985">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;">tests: Explicitly drop category from log<br><br>Let's disable category here since we don't care about its formatting here.<br><br>In any case, every test relying on logging output validation should<br>always explicitly state the config to avoid issues in the future if<br>default values change.<br><br>Change-Id: I7f9c56313cfaa74ebe666f44763a83d8102f5484<br>Related: OS#5034<br>---<br>M tests/alloc/AllocTest.cpp<br>M tests/app_info/AppInfoTest.cpp<br>M tests/bitcomp/BitcompTest.cpp<br>M tests/edge/EdgeTest.cpp<br>M tests/ms/MsTest.cpp<br>M tests/tbf/TbfTest.cpp<br>M tests/types/TypesTest.cpp<br>7 files changed, 14 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/alloc/AllocTest.cpp b/tests/alloc/AllocTest.cpp</span><br><span>index ecc3e80..eced0b8 100644</span><br><span>--- a/tests/alloc/AllocTest.cpp</span><br><span>+++ b/tests/alloc/AllocTest.cpp</span><br><span>@@ -814,6 +814,8 @@</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> log_set_print_filename(osmo_stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_print_category(osmo_stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_print_category_hex(osmo_stderr_target, 0);</span><br><span> log_set_category_filter(osmo_stderr_target, DTBF, 1, LOGL_INFO);</span><br><span> if (getenv("LOGL_DEBUG"))</span><br><span> log_set_log_level(osmo_stderr_target, LOGL_DEBUG);</span><br><span>diff --git a/tests/app_info/AppInfoTest.cpp b/tests/app_info/AppInfoTest.cpp</span><br><span>index f145fa5..707deb7 100644</span><br><span>--- a/tests/app_info/AppInfoTest.cpp</span><br><span>+++ b/tests/app_info/AppInfoTest.cpp</span><br><span>@@ -175,6 +175,8 @@</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> log_set_print_filename(osmo_stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_print_category(osmo_stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_print_category_hex(osmo_stderr_target, 0);</span><br><span> log_parse_category_mask(osmo_stderr_target, "DL1IF,1:DRLCMAC,3:DRLCMACSCHED,1");</span><br><span> </span><br><span> the_pcu = gprs_pcu_alloc(tall_pcu_ctx);</span><br><span>diff --git a/tests/bitcomp/BitcompTest.cpp b/tests/bitcomp/BitcompTest.cpp</span><br><span>index 14246fe..c3aa5c6 100644</span><br><span>--- a/tests/bitcomp/BitcompTest.cpp</span><br><span>+++ b/tests/bitcomp/BitcompTest.cpp</span><br><span>@@ -194,6 +194,8 @@</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> log_set_print_filename(osmo_stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_print_category(osmo_stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_print_category_hex(osmo_stderr_target, 0);</span><br><span> log_parse_category_mask(osmo_stderr_target, "DRLCMACUL,1");</span><br><span> </span><br><span> test_EPDAN_decode_tree();</span><br><span>@@ -213,4 +215,3 @@</span><br><span> void l1if_close_pdch() { abort(); }</span><br><span> void l1if_open_pdch() { abort(); }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span>diff --git a/tests/edge/EdgeTest.cpp b/tests/edge/EdgeTest.cpp</span><br><span>index 6161e0e..8536cfc 100644</span><br><span>--- a/tests/edge/EdgeTest.cpp</span><br><span>+++ b/tests/edge/EdgeTest.cpp</span><br><span>@@ -1396,6 +1396,8 @@</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> log_set_print_filename(osmo_stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_print_category(osmo_stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_print_category_hex(osmo_stderr_target, 0);</span><br><span> </span><br><span> the_pcu = gprs_pcu_alloc(tall_pcu_ctx);</span><br><span> </span><br><span>diff --git a/tests/ms/MsTest.cpp b/tests/ms/MsTest.cpp</span><br><span>index 677c695..583335c 100644</span><br><span>--- a/tests/ms/MsTest.cpp</span><br><span>+++ b/tests/ms/MsTest.cpp</span><br><span>@@ -614,6 +614,8 @@</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(120, 100%, 40%);">+ log_set_print_category(osmo_stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_print_category_hex(osmo_stderr_target, 0);</span><br><span> log_parse_category_mask(osmo_stderr_target, "DPCU,3:DRLCMAC,3");</span><br><span> </span><br><span> the_pcu = gprs_pcu_alloc(tall_pcu_ctx);</span><br><span>diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp</span><br><span>index 24fd109..8d0a5d0 100644</span><br><span>--- a/tests/tbf/TbfTest.cpp</span><br><span>+++ b/tests/tbf/TbfTest.cpp</span><br><span>@@ -3265,6 +3265,8 @@</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> log_set_print_filename(osmo_stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_print_category(osmo_stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_print_category_hex(osmo_stderr_target, 0);</span><br><span> log_parse_category_mask(osmo_stderr_target, "DRLCMAC,1:DRLCMACDATA,3:DRLCMACDL,3:DRLCMACUL,3:"</span><br><span> "DRLCMACSCHED,1:DRLCMACMEAS,3:DNS,3:DLBSSGP,3:DPCU,5:"</span><br><span> "DL1IF,6:DTBF,1:DTBFUL,1:DTBFDL,1:DLGLOBAL,2:");</span><br><span>diff --git a/tests/types/TypesTest.cpp b/tests/types/TypesTest.cpp</span><br><span>index 038d737..e9bcf4e 100644</span><br><span>--- a/tests/types/TypesTest.cpp</span><br><span>+++ b/tests/types/TypesTest.cpp</span><br><span>@@ -927,6 +927,8 @@</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> log_set_print_filename(osmo_stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_print_category(osmo_stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_print_category_hex(osmo_stderr_target, 0);</span><br><span> </span><br><span> log_set_category_filter(osmo_stderr_target, DTBF, 1, LOGL_INFO);</span><br><span> log_set_category_filter(osmo_stderr_target, DTBFUL, 1, LOGL_INFO);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/22985">change 22985</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/+/22985"/><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: I7f9c56313cfaa74ebe666f44763a83d8102f5484 </div>
<div style="display:none"> Gerrit-Change-Number: 22985 </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>