<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/22961">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tests: Set print_category values explicitly<br><br>This will alow easily changing default values for print_category vs<br>print_category_hex later.<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>Related: OS#5034<br>Change-Id: If29b40557d5c2bcda04b964f344070bad58d8f28<br>---<br>M tests/fsm/fsm_test.c<br>M tests/gb/bssgp_fc_test.c<br>M tests/gb/gprs_ns2_test.c<br>M tests/gb/gprs_ns_test.c<br>M tests/logging/logging_test.c<br>M tests/loggingrb/loggingrb_test.c<br>M tests/socket/socket_sctp_test.c<br>M tests/socket/socket_test.c<br>M tests/write_queue/wqueue_test.c<br>9 files changed, 17 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/61/22961/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/fsm/fsm_test.c b/tests/fsm/fsm_test.c</span><br><span>index fe48b2b..23e24cf 100644</span><br><span>--- a/tests/fsm/fsm_test.c</span><br><span>+++ b/tests/fsm/fsm_test.c</span><br><span>@@ -414,6 +414,8 @@</span><br><span>    log_add_target(stderr_target);</span><br><span>       log_set_print_filename(stderr_target, 0);</span><br><span>    log_set_use_color(stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+  log_set_print_category(stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+     log_set_print_category_hex(stderr_target, 0);</span><br><span>        g_ctrl = ctrl_handle_alloc(NULL, NULL, NULL);</span><br><span> </span><br><span>    g_ctx = NULL;</span><br><span>diff --git a/tests/gb/bssgp_fc_test.c b/tests/gb/bssgp_fc_test.c</span><br><span>index cc38777..23bcd57 100644</span><br><span>--- a/tests/gb/bssgp_fc_test.c</span><br><span>+++ b/tests/gb/bssgp_fc_test.c</span><br><span>@@ -149,6 +149,8 @@</span><br><span>     osmo_init_logging2(ctx, &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>       tall_msgb_ctx = msgb_talloc_ctx_init(ctx, 0);</span><br><span> </span><br><span>diff --git a/tests/gb/gprs_ns2_test.c b/tests/gb/gprs_ns2_test.c</span><br><span>index 6d71a8c..dfd28be 100644</span><br><span>--- a/tests/gb/gprs_ns2_test.c</span><br><span>+++ b/tests/gb/gprs_ns2_test.c</span><br><span>@@ -431,6 +431,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_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_log_level(osmo_stderr_target, LOGL_INFO);</span><br><span>    unitdata = talloc_zero(ctx, struct osmo_wqueue);</span><br><span>     osmo_wqueue_init(unitdata, 100);</span><br><span>diff --git a/tests/gb/gprs_ns_test.c b/tests/gb/gprs_ns_test.c</span><br><span>index f70e493..e8e8b80 100644</span><br><span>--- a/tests/gb/gprs_ns_test.c</span><br><span>+++ b/tests/gb/gprs_ns_test.c</span><br><span>@@ -904,6 +904,8 @@</span><br><span>      void *ctx = talloc_named_const(NULL, 0, "gprs_ns_test");</span><br><span>   osmo_init_logging2(ctx, &info);</span><br><span>  log_set_use_color(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_print_filename(osmo_stderr_target, 0);</span><br><span>       osmo_signal_register_handler(SS_L_NS, &test_signal, NULL);</span><br><span> </span><br><span>diff --git a/tests/logging/logging_test.c b/tests/logging/logging_test.c</span><br><span>index b9cb57f..d036dc5 100644</span><br><span>--- a/tests/logging/logging_test.c</span><br><span>+++ b/tests/logging/logging_test.c</span><br><span>@@ -78,6 +78,7 @@</span><br><span>  log_add_target(stderr_target);</span><br><span>       log_set_all_filter(stderr_target, 1);</span><br><span>        log_set_print_filename(stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+     log_set_print_category_hex(stderr_target, 0);</span><br><span>        log_set_print_category(stderr_target, 1);</span><br><span>    log_set_use_color(stderr_target, 0);</span><br><span> </span><br><span>diff --git a/tests/loggingrb/loggingrb_test.c b/tests/loggingrb/loggingrb_test.c</span><br><span>index 0b2ae5b..4a4d1f9 100644</span><br><span>--- a/tests/loggingrb/loggingrb_test.c</span><br><span>+++ b/tests/loggingrb/loggingrb_test.c</span><br><span>@@ -65,6 +65,8 @@</span><br><span>    log_add_target(ringbuf_target);</span><br><span>      log_set_all_filter(ringbuf_target, 1);</span><br><span>       log_set_print_filename(ringbuf_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+    log_set_print_category(ringbuf_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+    log_set_print_category_hex(ringbuf_target, 0);</span><br><span> </span><br><span>   log_parse_category_mask(ringbuf_target, "DRLL:DCC");</span><br><span>       log_parse_category_mask(ringbuf_target, "DRLL");</span><br><span>diff --git a/tests/socket/socket_sctp_test.c b/tests/socket/socket_sctp_test.c</span><br><span>index e70b8be..9705038 100644</span><br><span>--- a/tests/socket/socket_sctp_test.c</span><br><span>+++ b/tests/socket/socket_sctp_test.c</span><br><span>@@ -223,6 +223,8 @@</span><br><span>    osmo_init_logging2(ctx, &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> #ifdef HAVE_LIBSCTP</span><br><span>    test_sockinit2_multiaddr_simple();</span><br><span>   test_sockinit2_multiaddr_several();</span><br><span>diff --git a/tests/socket/socket_test.c b/tests/socket/socket_test.c</span><br><span>index 0bf2127..9619553 100644</span><br><span>--- a/tests/socket/socket_test.c</span><br><span>+++ b/tests/socket/socket_test.c</span><br><span>@@ -401,6 +401,8 @@</span><br><span>       osmo_init_logging2(ctx, &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>       test_sockinit();</span><br><span>     test_sockinit2();</span><br><span>diff --git a/tests/write_queue/wqueue_test.c b/tests/write_queue/wqueue_test.c</span><br><span>index 827e4e8..9c7a36e 100644</span><br><span>--- a/tests/write_queue/wqueue_test.c</span><br><span>+++ b/tests/write_queue/wqueue_test.c</span><br><span>@@ -73,6 +73,8 @@</span><br><span>       stderr_target = log_target_create_stderr();</span><br><span>  log_add_target(stderr_target);</span><br><span>       log_set_print_filename(stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+     log_set_print_category_hex(stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ log_set_print_category(stderr_target, 0);</span><br><span> </span><br><span>        test_wqueue_limit();</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/22961">change 22961</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/libosmocore/+/22961"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: If29b40557d5c2bcda04b964f344070bad58d8f28 </div>
<div style="display:none"> Gerrit-Change-Number: 22961 </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>