diff options
author | Harald Welte <laforge@gnumonks.org> | 2017-10-29 10:39:32 +0100 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2017-10-29 11:02:34 +0100 |
commit | ac0490ad2a086a4e2664bed19bfe2787cbf4d450 (patch) | |
tree | b53d2c8d120e0ad6134ac7deb25bb67c4fe2ce7c /tests/tbf | |
parent | 4c9ec22546264454662895123ff2b1310b1081ad (diff) |
tests: Don't use private version of log_info but global gprs_log_info
There's no need for each test case to carry their own log_info and
filter function. They can simply use the global gprs_log_info and
configure the stderr log verbosity according to their needs.
Change-Id: I8706a624e5d06e062d1198711aa197fbd0860769
Diffstat (limited to 'tests/tbf')
-rw-r--r-- | tests/tbf/TbfTest.cpp | 32 |
1 files changed, 4 insertions, 28 deletions
diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index 0db7fde7..195bec5f 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -3182,32 +3182,6 @@ static void test_tbf_egprs_dl() -static const struct log_info_cat default_categories[] = { - {"DCSN1", "\033[1;31m", "Concrete Syntax Notation One (CSN1)", LOGL_INFO, 0}, - {"DL1IF", "\033[1;32m", "GPRS PCU L1 interface (L1IF)", LOGL_DEBUG, 1}, - {"DRLCMAC", "\033[0;33m", "GPRS RLC/MAC layer (RLCMAC)", LOGL_DEBUG, 1}, - {"DRLCMACDATA", "\033[0;33m", "GPRS RLC/MAC layer Data (RLCMAC)", LOGL_DEBUG, 1}, - {"DRLCMACDL", "\033[1;33m", "GPRS RLC/MAC layer Downlink (RLCMAC)", LOGL_DEBUG, 1}, - {"DRLCMACUL", "\033[1;36m", "GPRS RLC/MAC layer Uplink (RLCMAC)", LOGL_DEBUG, 1}, - {"DRLCMACSCHED", "\033[0;36m", "GPRS RLC/MAC layer Scheduling (RLCMAC)", LOGL_DEBUG, 1}, - {"DRLCMACMEAS", "\033[1;31m", "GPRS RLC/MAC layer Measurements (RLCMAC)", LOGL_INFO, 1}, - {"DNS","\033[1;34m", "GPRS Network Service Protocol (NS)", LOGL_INFO , 1}, - {"DBSSGP","\033[1;34m", "GPRS BSS Gateway Protocol (BSSGP)", LOGL_INFO , 1}, - {"DPCU", "\033[1;35m", "GPRS Packet Control Unit (PCU)", LOGL_NOTICE, 1}, -}; - -static int filter_fn(const struct log_context *ctx, - struct log_target *tar) -{ - return 1; -} - -const struct log_info debug_log_info = { - filter_fn, - (struct log_info_cat*)default_categories, - ARRAY_SIZE(default_categories), -}; - static void test_packet_access_rej_prr_no_other_tbfs() { BTS the_bts; @@ -3348,13 +3322,15 @@ int main(int argc, char **argv) abort(); msgb_talloc_ctx_init(tall_pcu_ctx, 0); - osmo_init_logging(&debug_log_info); + osmo_init_logging(&gprs_log_info); log_set_use_color(osmo_stderr_target, 0); log_set_print_filename(osmo_stderr_target, 0); bssgp_set_log_ss(DBSSGP); + log_parse_category_mask(osmo_stderr_target, "DL1IF,1:DRLCMAC,1:DRLCMACDATA,1:DRLCMACDL,1:" + "DRLCMACUL,1:DRLCMACSCHED,1:DRLCMACMEAS,3:DNS,3:DBSSGP,3:DPCU,5"); vty_init(&pcu_vty_info); - pcu_vty_init(&debug_log_info); + pcu_vty_init(&gprs_log_info); test_tbf_base(); test_tbf_tlli_update(); |