fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/27013 )

Change subject: tests/logging: merge both logging_test_{stream,wqueue}.err ......................................................................

tests/logging: merge both logging_test_{stream,wqueue}.err

Change-Id: I0ff0a6e0d22575047cc00dd822bc94d696171076 --- R tests/logging/logging_test.err D tests/logging/logging_test_wqueue.err M tests/testsuite.at 3 files changed, 2 insertions(+), 13 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/13/27013/1

diff --git a/tests/logging/logging_test_stream.err b/tests/logging/logging_test.err similarity index 100% rename from tests/logging/logging_test_stream.err rename to tests/logging/logging_test.err diff --git a/tests/logging/logging_test_wqueue.err b/tests/logging/logging_test_wqueue.err deleted file mode 100644 index 01ab878..0000000 --- a/tests/logging/logging_test_wqueue.err +++ /dev/null @@ -1,11 +0,0 @@ -DRLL You should see this -DCC You should see this -DRLL You should see this -DLGLOBAL You should see this on DLGLOBAL (a) -DLGLOBAL You should see this on DLGLOBAL (b) -DLGLOBAL You should see this on DLGLOBAL (c) -DLGLOBAL You should see this on DLGLOBAL (d) -DLGLOBAL You should see this on DLGLOBAL (e) -DLGLOBAL You should see this (DLGLOBAL on DEBUG) -DLGLOBAL logging_test.c:137 A message with source info printed first -DLGLOBAL A message with source info printed last (logging_test.c:139) diff --git a/tests/testsuite.at b/tests/testsuite.at index 5da08e5..ca133bb 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -171,14 +171,14 @@ AT_SETUP([logging_stream]) AT_KEYWORDS([logging_stream]) cat $abs_srcdir/logging/logging_test.ok > expout -cat $abs_srcdir/logging/logging_test_stream.err > experr +cat $abs_srcdir/logging/logging_test.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 +cat $abs_srcdir/logging/logging_test.err > experr AT_CHECK([$abs_top_builddir/tests/logging/logging_test wqueue], [0], [expout], [experr]) AT_CLEANUP