fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/libosmocore/+/27009 )
Change subject: tests/logging: ensure both stream and wqueue modes are tested
......................................................................
tests/logging: ensure both stream and wqueue modes are tested
Change-Id: I37e789b5b287d72c443f50fd99a5284bc7296c0b
---
M tests/logging/logging_test.c
R tests/logging/logging_test_stream.err
C tests/logging/logging_test_wqueue.err
M tests/testsuite.at
4 files changed, 16 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/09/27009/1
diff --git a/tests/logging/logging_test.c b/tests/logging/logging_test.c
index ac6fc52..12a7374 100644
--- a/tests/logging/logging_test.c
+++ b/tests/logging/logging_test.c
@@ -78,6 +78,11 @@
log_set_print_category(stderr_target, 1);
log_set_use_color(stderr_target, 0);
+ if (argc > 1 && !strcmp(argv[1], "wqueue"))
+ log_target_file_switch_to_wqueue(stderr_target);
+ else
+ log_target_file_switch_to_stream(stderr_target);
+
log_parse_category_mask(stderr_target, "DRLL:DCC");
log_parse_category_mask(stderr_target, "DRLL");
diff --git a/tests/logging/logging_test.err b/tests/logging/logging_test_stream.err
similarity index 100%
rename from tests/logging/logging_test.err
rename to tests/logging/logging_test_stream.err
diff --git a/tests/logging/logging_test.err b/tests/logging/logging_test_wqueue.err
similarity index 100%
copy from tests/logging/logging_test.err
copy to tests/logging/logging_test_wqueue.err
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 882203e..5da08e5 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -168,11 +168,18 @@
AT_CHECK([$abs_top_builddir/tests/gprs/gprs_test], [0], [expout], [ignore])
AT_CLEANUP
-AT_SETUP([logging])
-AT_KEYWORDS([logging])
+AT_SETUP([logging_stream])
+AT_KEYWORDS([logging_stream])
cat $abs_srcdir/logging/logging_test.ok > expout
-cat $abs_srcdir/logging/logging_test.err > experr
-AT_CHECK([$abs_top_builddir/tests/logging/logging_test], [0], [expout], [experr])
+cat $abs_srcdir/logging/logging_test_stream.err > experr
+AT_CHECK([$abs_top_builddir/tests/logging/logging_test stream], [0], [expout], [experr])
+AT_CLEANUP
+
+AT_SETUP([logging_wqueue])
+AT_KEYWORDS([logging_wqueue])
+cat $abs_srcdir/logging/logging_test.ok > expout
+cat $abs_srcdir/logging/logging_test_wqueue.err > experr
+AT_CHECK([$abs_top_builddir/tests/logging/logging_test wqueue], [0], [expout], [experr])
AT_CLEANUP
AT_SETUP([codec])
--
To view, visit
https://gerrit.osmocom.org/c/libosmocore/+/27009
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I37e789b5b287d72c443f50fd99a5284bc7296c0b
Gerrit-Change-Number: 27009
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newchange