Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

subsys: logger: fix merge error #10172

Merged

Conversation

aescolar
Copy link
Member

Fix merge error introduced in:
ba01a39
(as part of #9362)
which deleted the native_posix backend for the logger.

Signed-off-by: Alberto Escolar Piedras alpi@oticon.com

Partially f ixes #10164
Needed by #10163

Fix merge error introduced in:
ba01a39
(as part of zephyrproject-rtos#9362)
which deleted the native_posix backend for the logger.

Signed-off-by: Alberto Escolar Piedras <alpi@oticon.com>
@aescolar aescolar added bug The issue is a bug, or the PR is fixing a bug priority: high High impact/importance bug area: Logging area: native port Host native arch port (native_sim) labels Sep 24, 2018
@aescolar aescolar requested a review from carlescufi September 24, 2018 08:36
Copy link
Contributor

@nordic-krch nordic-krch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for fixing that.

@codecov-io
Copy link

Codecov Report

Merging #10172 into master will increase coverage by 0.45%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #10172      +/-   ##
==========================================
+ Coverage   52.58%   53.03%   +0.45%     
==========================================
  Files         213      214       +1     
  Lines       26148    26177      +29     
  Branches     5636     5642       +6     
==========================================
+ Hits        13749    13884     +135     
+ Misses      10145    10024     -121     
- Partials     2254     2269      +15
Impacted Files Coverage Δ
subsys/logging/log_backend_native_posix.c 89.65% <0%> (ø)
include/logging/log_msg.h 84.84% <0%> (+3.03%) ⬆️
subsys/logging/log_msg.c 85.92% <0%> (+3.7%) ⬆️
boards/posix/native_posix/tracing.c 48.71% <0%> (+5.12%) ⬆️
subsys/logging/log_output.c 66.24% <0%> (+63.69%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0287a04...1544324. Read the comment docs.

@carlescufi carlescufi merged commit 204acc8 into zephyrproject-rtos:master Sep 24, 2018
@aescolar aescolar deleted the logger_merge_screw_up_fix branch October 10, 2018 07:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: Logging area: native port Host native arch port (native_sim) bug The issue is a bug, or the PR is fixing a bug priority: high High impact/importance bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants