fixeria has submitted this change. ( 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
---
M tests/Makefile.am
R tests/logging/logging_test.err
D tests/logging/logging_test_wqueue.err
M tests/testsuite.at
4 files changed, 5 insertions(+), 21 deletions(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
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
3 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27013
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I0ff0a6e0d22575047cc00dd822bc94d696171076
Gerrit-Change-Number: 27013
Gerrit-PatchSet: 5
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-MessageType: merged
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27012 )
Change subject: logging: fix printing of '\0' when filename printed last
......................................................................
logging: fix printing of '\0' when filename printed last
As was demonstrated in I54bf5e5c036efb1908232fe3d8e8e2989715fbb3,
when the logging is configured to print the filename *after* the
logging message, each logging line contains an artifact - '\0'.
The problem is that the 'len' variable is not updated. Fix this.
Change-Id: I5c920a0d5c1cf45bcdd327b39e33d63346b4f51c
Fixes: I393907b3c9e0cc1145e102328adad0a83ee13a9f
---
M src/logging.c
M tests/logging/logging_test_wqueue.err
2 files changed, 2 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/logging.c b/src/logging.c
index 5336e53..1a0abc2 100644
--- a/src/logging.c
+++ b/src/logging.c
@@ -586,6 +586,7 @@
break;
case LOG_FILENAME_PATH:
offset--;
+ len--;
ret = snprintf(buf + offset, rem, " (%s:%d)\n", file, line);
if (ret < 0)
goto err;
@@ -593,6 +594,7 @@
break;
case LOG_FILENAME_BASENAME:
offset--;
+ len--;
ret = snprintf(buf + offset, rem, " (%s:%d)\n", const_basename(file), line);
if (ret < 0)
goto err;
diff --git a/tests/logging/logging_test_wqueue.err b/tests/logging/logging_test_wqueue.err
index 3e2008b..01ab878 100644
--- a/tests/logging/logging_test_wqueue.err
+++ b/tests/logging/logging_test_wqueue.err
Binary files differ
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27012
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I5c920a0d5c1cf45bcdd327b39e33d63346b4f51c
Gerrit-Change-Number: 27012
Gerrit-PatchSet: 5
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: roox, laforge, tnt.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/27020 )
Change subject: GPS-DO support for icE1usb hardware
......................................................................
Patch Set 2: Code-Review+1
(2 comments)
File src/usb.c:
https://gerrit.osmocom.org/c/osmo-e1d/+/27020/comment/79a32bfe_672f26a6
PS2, Line 805: intf_data->devh = devh;
can't these lines here and in the else branch be moved below into the generic path?
https://gerrit.osmocom.org/c/osmo-e1d/+/27020/comment/67fcf2f0_08e62257
PS2, Line 929: if ((id->bInterfaceClass == 0xff) && (id->bInterfaceSubClass == 0xe1) &&
It'b be fine having defines for these values.
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/27020
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: If5e2a6b2dae0290ce3186009e68f618049ebf5ff
Gerrit-Change-Number: 27020
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: roox <mardnh(a)gmx.de>
Gerrit-Reviewer: tnt <tnt(a)246tNt.com>
Gerrit-Attention: roox <mardnh(a)gmx.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: tnt <tnt(a)246tNt.com>
Gerrit-Comment-Date: Mon, 31 Jan 2022 16:49:57 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: laforge, fixeria.
Hello Jenkins Builder, laforge,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-iuh/+/26955
to look at the new patch set (#6).
Change subject: ranap_common_ran: add decoder for CN/MSC originated messages
......................................................................
ranap_common_ran: add decoder for CN/MSC originated messages
Lets add a counterpart for ranap_common_cn that works the same, but
decodes CN/MSC originated messages.
Change-Id: Iad4c2743d4d1ddf8ad49002d1fe6866f22eb9e98
Related: OS#5152
---
M include/osmocom/ranap/Makefile.am
M include/osmocom/ranap/ranap_common.h
M include/osmocom/ranap/ranap_common_cn.h
A include/osmocom/ranap/ranap_common_ran.h
M src/Makefile.am
A src/ranap_common_ran.c
6 files changed, 204 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/55/26955/6
--
To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26955
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-iuh
Gerrit-Branch: master
Gerrit-Change-Id: Iad4c2743d4d1ddf8ad49002d1fe6866f22eb9e98
Gerrit-Change-Number: 26955
Gerrit-PatchSet: 6
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: daniel <dwillmann(a)sysmocom.de>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: laforge, fixeria.
dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/26955 )
Change subject: ranap_common_ran: add decoder for CN/MSC originated messages
......................................................................
Patch Set 6:
(6 comments)
Patchset:
PS5:
> I think they are rather critical, thanks for finding them!
Thanks for reviewing this.
File include/osmocom/ranap/ranap_common.h:
https://gerrit.osmocom.org/c/osmo-iuh/+/26955/comment/adddf1bf_971d785d
PS5, Line 599: funktions
> Tippfehler: functions
Done
File src/ranap_common_ran.c:
https://gerrit.osmocom.org/c/osmo-iuh/+/26955/comment/53eece89_29e35e55
PS5, Line 90: unsuccessfulOutcome
> successfulOutcome? I think it's not critical, given that 'procedureCode' is present in all union mem […]
Oh, thats indeed wrong.
https://gerrit.osmocom.org/c/osmo-iuh/+/26955/comment/b2a9c055_5a06f869
PS5, Line 102: unsuccessfulOutcome
> outcome? I think it's not critical, given that 'procedureCode' is present in all union members at th […]
Done
https://gerrit.osmocom.org/c/osmo-iuh/+/26955/comment/6afc7803_8b20c04e
PS5, Line 124: unsuccessful
> copy-paste: successful
Done
https://gerrit.osmocom.org/c/osmo-iuh/+/26955/comment/6811ad06_5e934f42
PS5, Line 132: unsuccessful
> Neither unsuccessful not successful, so this word should be removed.
Done
--
To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/26955
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-iuh
Gerrit-Branch: master
Gerrit-Change-Id: Iad4c2743d4d1ddf8ad49002d1fe6866f22eb9e98
Gerrit-Change-Number: 26955
Gerrit-PatchSet: 6
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: daniel <dwillmann(a)sysmocom.de>
Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-CC: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 31 Jan 2022 16:42:22 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-MessageType: comment