<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-hlr/+/22975">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: Replace deprecated API log_set_print_filename<br><br>log_set_print_category_hex(0) is added in some places since the old API<br>used to set that internally to keep backward compatiblity.<br><br>Change-Id: I3cf46b7c24452254319d5c3eacceff418211bcf7<br>---<br>M tests/auc/auc_test.c<br>M tests/auc/gen_ts_55_205_test_sets/main_template.c<br>M tests/db/db_test.c<br>M tests/gsup/gsup_test.c<br>M tests/mslookup/mdns_test.c<br>M tests/mslookup/mslookup_client_mdns_test.c<br>M tests/mslookup/mslookup_client_test.c<br>M tests/mslookup/mslookup_test.c<br>8 files changed, 17 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/auc/auc_test.c b/tests/auc/auc_test.c</span><br><span>index c0620db..6bf2eb2 100644</span><br><span>--- a/tests/auc/auc_test.c</span><br><span>+++ b/tests/auc/auc_test.c</span><br><span>@@ -668,9 +668,13 @@</span><br><span>         void *tall_ctx = talloc_named_const(NULL, 1, "auc_test");</span><br><span> </span><br><span>      osmo_init_logging2(tall_ctx, &hlr_log_info);</span><br><span style="color: hsl(0, 100%, 40%);">-        log_set_print_filename(osmo_stderr_target, cmdline_opts.verbose);</span><br><span style="color: hsl(120, 100%, 40%);">+     log_set_print_filename2(osmo_stderr_target,</span><br><span style="color: hsl(120, 100%, 40%);">+                           cmdline_opts.verbose ?</span><br><span style="color: hsl(120, 100%, 40%);">+                                        LOG_FILENAME_BASENAME :</span><br><span style="color: hsl(120, 100%, 40%);">+                                       LOG_FILENAME_NONE);</span><br><span>  log_set_print_timestamp(osmo_stderr_target, 0);</span><br><span>      log_set_use_color(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_category(osmo_stderr_target, 1);</span><br><span>       log_parse_category_mask(osmo_stderr_target, "DMAIN,1:DDB,1:DAUC,1");</span><br><span> </span><br><span>diff --git a/tests/auc/gen_ts_55_205_test_sets/main_template.c b/tests/auc/gen_ts_55_205_test_sets/main_template.c</span><br><span>index 3fafdf5..509416a 100644</span><br><span>--- a/tests/auc/gen_ts_55_205_test_sets/main_template.c</span><br><span>+++ b/tests/auc/gen_ts_55_205_test_sets/main_template.c</span><br><span>@@ -106,9 +106,10 @@</span><br><span>   void *tall_ctx = talloc_named_const(NULL, 1, "test");</span><br><span>      msgb_talloc_ctx_init(tall_ctx, 0);</span><br><span>   osmo_init_logging2(tall_ctx, &hlr_log_info);</span><br><span style="color: hsl(0, 100%, 40%);">-        log_set_print_filename(osmo_stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+        log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);</span><br><span>      log_set_print_timestamp(osmo_stderr_target, 0);</span><br><span>      log_set_use_color(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_category(osmo_stderr_target, 1);</span><br><span>       log_parse_category_mask(osmo_stderr_target, "DMAIN,1:DDB,1:DAUC,1");</span><br><span> </span><br><span>diff --git a/tests/db/db_test.c b/tests/db/db_test.c</span><br><span>index c1df9bf..0c68238 100644</span><br><span>--- a/tests/db/db_test.c</span><br><span>+++ b/tests/db/db_test.c</span><br><span>@@ -980,9 +980,13 @@</span><br><span>       handle_options(argc, argv);</span><br><span> </span><br><span>      osmo_init_logging2(ctx, &hlr_log_info);</span><br><span style="color: hsl(0, 100%, 40%);">-     log_set_print_filename(osmo_stderr_target, cmdline_opts.verbose);</span><br><span style="color: hsl(120, 100%, 40%);">+     log_set_print_filename2(osmo_stderr_target,</span><br><span style="color: hsl(120, 100%, 40%);">+                           cmdline_opts.verbose ?</span><br><span style="color: hsl(120, 100%, 40%);">+                                        LOG_FILENAME_BASENAME :</span><br><span style="color: hsl(120, 100%, 40%);">+                                       LOG_FILENAME_NONE);</span><br><span>  log_set_print_timestamp(osmo_stderr_target, 0);</span><br><span>      log_set_use_color(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_category(osmo_stderr_target, 1);</span><br><span>       log_parse_category_mask(osmo_stderr_target, "DMAIN,1:DDB,1:DAUC,1");</span><br><span> </span><br><span>diff --git a/tests/gsup/gsup_test.c b/tests/gsup/gsup_test.c</span><br><span>index 1a7bb76..88c6093 100644</span><br><span>--- a/tests/gsup/gsup_test.c</span><br><span>+++ b/tests/gsup/gsup_test.c</span><br><span>@@ -101,7 +101,7 @@</span><br><span> {</span><br><span>   ctx = talloc_named_const(NULL, 0, "gsup_test");</span><br><span>    osmo_init_logging2(ctx, &info);</span><br><span style="color: hsl(0, 100%, 40%);">-     log_set_print_filename(osmo_stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+        log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);</span><br><span>      log_set_print_timestamp(osmo_stderr_target, 0);</span><br><span>      log_set_use_color(osmo_stderr_target, 0);</span><br><span>    log_set_print_category(osmo_stderr_target, 1);</span><br><span>diff --git a/tests/mslookup/mdns_test.c b/tests/mslookup/mdns_test.c</span><br><span>index 8a60e85..0c8be46 100644</span><br><span>--- a/tests/mslookup/mdns_test.c</span><br><span>+++ b/tests/mslookup/mdns_test.c</span><br><span>@@ -583,7 +583,7 @@</span><br><span>    void *ctx = talloc_named_const(NULL, 0, "main");</span><br><span>   osmo_init_logging2(ctx, NULL);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      log_set_print_filename(osmo_stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+        log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);</span><br><span>      log_set_print_level(osmo_stderr_target, 1);</span><br><span>  log_set_print_category(osmo_stderr_target, 1);</span><br><span>       log_set_print_category_hex(osmo_stderr_target, 0);</span><br><span>diff --git a/tests/mslookup/mslookup_client_mdns_test.c b/tests/mslookup/mslookup_client_mdns_test.c</span><br><span>index 5e558b4..dc9d1d5 100644</span><br><span>--- a/tests/mslookup/mslookup_client_mdns_test.c</span><br><span>+++ b/tests/mslookup/mslookup_client_mdns_test.c</span><br><span>@@ -233,7 +233,7 @@</span><br><span>        ctx = talloc_named_const(NULL, 0, "main");</span><br><span>         osmo_init_logging2(ctx, NULL);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      log_set_print_filename(osmo_stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+        log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);</span><br><span>      log_set_print_level(osmo_stderr_target, 0);</span><br><span>  log_set_print_category(osmo_stderr_target, 0);</span><br><span>       log_set_print_category_hex(osmo_stderr_target, 0);</span><br><span>diff --git a/tests/mslookup/mslookup_client_test.c b/tests/mslookup/mslookup_client_test.c</span><br><span>index 40be011..9fcb983 100644</span><br><span>--- a/tests/mslookup/mslookup_client_test.c</span><br><span>+++ b/tests/mslookup/mslookup_client_test.c</span><br><span>@@ -174,7 +174,7 @@</span><br><span>    ctx = talloc_named_const(NULL, 0, "main");</span><br><span>         osmo_init_logging2(ctx, NULL);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      log_set_print_filename(osmo_stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+        log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);</span><br><span>      log_set_print_level(osmo_stderr_target, 0);</span><br><span>  log_set_print_category(osmo_stderr_target, 0);</span><br><span>       log_set_print_category_hex(osmo_stderr_target, 0);</span><br><span>diff --git a/tests/mslookup/mslookup_test.c b/tests/mslookup/mslookup_test.c</span><br><span>index 1672bd0..a5efa00 100644</span><br><span>--- a/tests/mslookup/mslookup_test.c</span><br><span>+++ b/tests/mslookup/mslookup_test.c</span><br><span>@@ -73,7 +73,7 @@</span><br><span>  ctx = talloc_named_const(NULL, 0, "main");</span><br><span>         osmo_init_logging2(ctx, NULL);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      log_set_print_filename(osmo_stderr_target, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+        log_set_print_filename2(osmo_stderr_target, LOG_FILENAME_NONE);</span><br><span>      log_set_print_level(osmo_stderr_target, 0);</span><br><span>  log_set_print_category(osmo_stderr_target, 0);</span><br><span>       log_set_print_category_hex(osmo_stderr_target, 0);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-hlr/+/22975">change 22975</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-hlr/+/22975"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-hlr </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I3cf46b7c24452254319d5c3eacceff418211bcf7 </div>
<div style="display:none"> Gerrit-Change-Number: 22975 </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>