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

osal Integration candidate: 2021-02-23 #830

Merged
merged 16 commits into from
Feb 26, 2021
Merged

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Feb 24, 2021

Describe the contribution
Fix #798 and #799, tests fail when no network
Fix #814, UT Stub match macro behavior
Fix #819, Remove redundant logic
Fix #817, Simplify name truncation in OS_CreateSocketName
Fix #779, Change global vars to not be hidden by local vars.
Fix #770, Remove deprecated elements
Fix #737, UT_Stub_CheckForceFail -> UT_Stub_CheckDefaultReturnValue

Testing performed
See https://github.com/nasa/cFS/pull/193/checks

Expected behavior changes

PR #813 - Makes tests skip after getting their first not implemented error.

PR #815 - Updates stub helpers to match the behavior of calling the default implementation stub macro (NULL VA list)

PR #820 - Removes redundant logic and assignment to fix static analysis warnings

PR #818 - Truncates at the end of the logic flow for socket name as opposed to possibly 3 different locations. Fixes static analysis warning.

PR #794 - Renames timer_id in unit tests to local_timer_id to avoid conflicts

PR #822 - Removes all deprecated elements

PR #823 - No behavior change. Renames UT_Stub_CheckForceFail to UT_Stub_CheckDefaultReturnValue, also only sets Value if not NULL (can pass in NULL value doesn't matter)

System(s) tested on
Ubuntu 18.04

Additional context
Part of nasa/cFS#193

Third party code
None

Contributor Info - All information REQUIRED for consideration of pull request
@zanzaben
@skliper

Fix #737, UT_Stub_CheckForceFail -> UT_Stub_CheckDefaultReturnValue
Update all Development version items in ReadMe.md to use "v" before the version number
@astrogeco astrogeco marked this pull request as ready for review February 26, 2021 17:29
@astrogeco astrogeco merged commit 98a2516 into main Feb 26, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Feb 26, 2021
@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
The version number macros major, minor, and revision, are used in the HK telemetry which can lead to confusion.
jphickey pushed a commit to jphickey/osal that referenced this pull request Aug 10, 2022
The version number macros major, minor, and revision, are used in the HK telemetry which can lead to confusion.
jphickey pushed a commit to jphickey/osal that referenced this pull request Aug 10, 2022
Fix nasa#830, Set Revision to 99 for development build
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment