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

Fix #1002, remove extra newlines in utassert logs #1003

Merged

Conversation

jphickey
Copy link
Contributor

Describe the contribution
If messages (e.g. from UtPrintf, etc) already have a newline, do not add another.

Fixes #1002

Testing performed
Build and run OSAL unit tests

Expected behavior changes
Extra blank lines in test log are removed.

System(s) tested on
Ubuntu 20.04

Additional context
This should preserve extra newlines in the event that the test case was intentionally adding whitespace, by only appending one if it was not there to begin with.

Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.

If messages (e.g. from UtPrintf, etc) already have a newline,
do not add another.
@jphickey jphickey force-pushed the fix-1002-utassert-newlines branch from 6f8628b to 51e4f85 Compare May 12, 2021 15:19
@jphickey jphickey added the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label May 12, 2021
@astrogeco
Copy link
Contributor

CCB:2021-05-12 APPROVED

@astrogeco astrogeco added CCB:Approved Indicates code review and approval by community CCB IC:2021-05-18 and removed CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels May 12, 2021
@astrogeco astrogeco merged commit 2607cd2 into nasa:integration-candidate May 12, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request May 19, 2021
nasa/cFE#1482, Resolve sequence count auto-increment rollover bug

nasa/osal#985, rename hooks to handlers
nasa/osal#1000, propagate status code in OS_rmdir
nasa/osal#1001, rework "unit-tests" to use macros
nasa/osal#1003, remove extra newlines in utassert logs
nasa/osal#990, Add test for object id inline functions
nasa/osal#998, fixed invalid inputs for OS_mkdir
nasa/osal#812, Improves config guide documentation
astrogeco added a commit to nasa/cFS that referenced this pull request May 19, 2021
Combines:

nasa/cFE#1508, cFE v6.8.0-rc1+dev580
nasa/osal#1006, osal v5.1.0-rc1+dev452

Includes:

nasa/cFE#1482, Resolve sequence count auto-increment rollover bug
nasa/cFE#1491, Correctly format code block section terminator
nasa/cFE#1530, Fix typos in developer guide

nasa/osal#985, rename hooks to handlers
nasa/osal#1000, propagate status code in OS_rmdir
nasa/osal#1001, rework "unit-tests" to use macros
nasa/osal#1003, remove extra newlines in utassert logs
nasa/osal#990, Add test for object id inline functions
nasa/osal#998, fixed invalid inputs for OS_mkdir
nasa/osal#812, Improves config guide documentation
nasa/osal#987, Show CodeQL Preview
astrogeco added a commit to nasa/cFS that referenced this pull request May 19, 2021
Combines:

nasa/cFE#1508, cFE v6.8.0-rc1+dev580
nasa/osal#1006, osal v5.1.0-rc1+dev452

Includes:

nasa/cFE#1482, Resolve sequence count auto-increment rollover bug
nasa/cFE#1491, Correctly format code block section terminator
nasa/cFE#1530, Fix typos in developer guide

nasa/osal#985, rename hooks to handlers
nasa/osal#1000, propagate status code in OS_rmdir
nasa/osal#1001, rework "unit-tests" to use macros
nasa/osal#1003, remove extra newlines in utassert logs
nasa/osal#990, Add test for object id inline functions
nasa/osal#998, fixed invalid inputs for OS_mkdir
nasa/osal#812, Improves config guide documentation
nasa/osal#987, Show CodeQL Preview

Co-Authored-By: Jake Hageman <[email protected]>
Co-Authored-By: Joseph Hickey <[email protected]>
Co-Authored-By: Ariel Adams <[email protected]>
Co-Authored-By: Alex Campbell <[email protected]>
Co-Authored-By: Tobias Nießen <[email protected]>
Co-Authored-By: Jonathan Bohren <[email protected]>
Co-Authored-By: Andrei Tumbar <[email protected]>
@jphickey jphickey deleted the fix-1002-utassert-newlines branch May 26, 2021 18:48
@skliper skliper added this to the 6.0.0 milestone Sep 24, 2021
jphickey pushed a commit to jphickey/osal that referenced this pull request Aug 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CCB:Approved Indicates code review and approval by community CCB
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants