tests/logging: merge both logging_test_{stream,wqueue}.err
Change-Id: I0ff0a6e0d22575047cc00dd822bc94d696171076
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3375c45..f54ce18 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -363,9 +363,7 @@
gb/gprs_ns2_test.ok \
gprs/gprs_test.ok kasumi/kasumi_test.ok \
msgfile/msgfile_test.ok msgfile/msgconfig.cfg \
- logging/logging_test.ok \
- logging/logging_test_stream.err \
- logging/logging_test_wqueue.err \
+ logging/logging_test.ok logging/logging_test.err \
logging/logging_vty_test.vty \
fr/fr_test.ok loggingrb/logging_test.ok \
loggingrb/logging_test.err strrb/strrb_test.ok \
@@ -503,12 +501,9 @@
>$(srcdir)/gsm48/rest_octets_test.ok
gprs/gprs_test \
>$(srcdir)/gprs/gprs_test.ok
- logging/logging_test wqueue \
+ logging/logging_test \
>$(srcdir)/logging/logging_test.ok \
- 2>$(srcdir)/logging/logging_test_wqueue.err
- logging/logging_test stream \
- >$(srcdir)/logging/logging_test.ok \
- 2>$(srcdir)/logging/logging_test_stream.err
+ 2>$(srcdir)/logging/logging_test.err
codec/codec_test \
>$(srcdir)/codec/codec_test.ok
codec/codec_ecu_fr_test \
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