-
Notifications
You must be signed in to change notification settings - Fork 204
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 #1417, #1387, #1393, generated coverage stubs for CFE core #1463
Merged
astrogeco
merged 3 commits into
nasa:integration-candidate
from
jphickey:fix-1417-cfe-coverage-stubs
May 11, 2021
Merged
Fix #1417, #1387, #1393, generated coverage stubs for CFE core #1463
astrogeco
merged 3 commits into
nasa:integration-candidate
from
jphickey:fix-1417-cfe-coverage-stubs
May 11, 2021
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jphickey
force-pushed
the
fix-1417-cfe-coverage-stubs
branch
from
April 30, 2021 12:58
c5c31b4
to
b35bc34
Compare
jphickey
changed the title
Fix #1417, generated coverage stubs for CFE core
Fix #1417, 1387, 1393, generated coverage stubs for CFE core
Apr 30, 2021
jphickey
force-pushed
the
fix-1417-cfe-coverage-stubs
branch
from
April 30, 2021 13:08
439a33d
to
8201deb
Compare
jphickey
added
the
CCB:Ready
Ready for discussion at the Configuration Control Board (CCB)
label
May 5, 2021
astrogeco
changed the title
Fix #1417, 1387, 1393, generated coverage stubs for CFE core
Fix #1417, #1387, #1393, generated coverage stubs for CFE core
May 5, 2021
astrogeco
added
the
CCB:Approved
Indicates code review and approval by community CCB
label
May 5, 2021
CCB:2021-05-05 APPROVED with changes
|
astrogeco
previously requested changes
May 5, 2021
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Rename *hooks.c
as *handler.c
where appropriate
This was referenced May 5, 2021
jphickey
added a commit
to jphickey/cFE
that referenced
this pull request
May 6, 2021
CCB 2021-05-05 review item, matches name used in code.
Update CFE core stub libraries to use generated stubs, using the generator script now part of UT Assert. All existing stub logic is converted to a default handler routine. This also entailed moving all of the internal API prototypes to be in the "core_private" interface lib rather than in "core_api". The only reason this was not done earlier was due to issues with the stubs, but that is alleviated when using generated stubs.
This function should only be called internally from ES and therefore does not need to be in public API.
CCB 2021-05-05 review item, matches name used in code.
jphickey
force-pushed
the
fix-1417-cfe-coverage-stubs
branch
from
May 6, 2021 13:06
2a2a434
to
2d2a7f9
Compare
Rebased to main to resolve conflict, and updated to rename hooks to handlers (see commit 2d2a7f9) |
astrogeco
approved these changes
May 11, 2021
astrogeco
removed
the
CCB:Ready
Ready for discussion at the Configuration Control Board (CCB)
label
May 11, 2021
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
May 11, 2021
nasa/cFE#1487, Remove broken travis-ci script nasa/cFE#1463, generated coverage stubs for CFE core nasa/cFE#1463, Move CFE_FS_RunBackgroundFileDump to internal API nasa/cFE#1451, OSAL config file simplification
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
May 12, 2021
nasa/cFE#1492, cFE v6.8.0-rc1+dev575 nasa/osal#996, osal v5.1.0-rc1+dev434 nasa/cFE#1487, Remove broken travis-ci script nasa/cFE#1463, generated coverage stubs for CFE core nasa/cFE#1463, Move CFE_FS_RunBackgroundFileDump to internal API nasa/cFE#1451, OSAL config file simplification nasa/cFE#1489, removes --quiet option so files checked go to stdout nasa/osal#978, configuration guide updates nasa/osal#974, improve documentation of UtAssert API calls nasa/osal#977, update OS_TaskCreate doc nasa/osal#997, Enable cppcheck results output nasa/osal#980, Scrub return values nasa/osal#992, add local mutex to BSP console nasa/osal#993, do not require nonblock mode
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
May 12, 2021
nasa/cFE#1492, cFE v6.8.0-rc1+dev575 nasa/osal#996, osal v5.1.0-rc1+dev434 nasa/cFE#1487, Remove broken travis-ci script nasa/cFE#1463, generated coverage stubs for CFE core nasa/cFE#1463, Move CFE_FS_RunBackgroundFileDump to internal API nasa/cFE#1451, OSAL config file simplification nasa/cFE#1489, removes --quiet option so files checked go to stdout nasa/osal#978, configuration guide updates nasa/osal#974, improve documentation of UtAssert API calls nasa/osal#977, update OS_TaskCreate doc nasa/osal#997, Enable cppcheck results output nasa/osal#980, Scrub return values nasa/osal#992, add local mutex to BSP console nasa/osal#993, do not require nonblock mode Co-authored-by: Jacob Hageman <jacob.hageman@nasa.gov> Co-authored-by: Joseph Hickey <joseph.p.hickey@nasa.gov>
Note this also fixed #1055 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Describe the contribution
Update CFE core stub libraries to use generated stubs, using the generator script now part of UT Assert. All existing stub logic is converted to a default handler routine.
This also entailed moving all of the internal API prototypes to be in the "core_private" interface lib rather than in "core_api". The
only reason this was not done earlier was due to issues with the stubs, but that is alleviated when using generated stubs.
Fixes #1417
Fixes #1387
Fixes #1393
Testing performed
Build and sanity check CFE, run all unit tests
Expected behavior changes
No impact to FSW.
For unit testing, this allows the stub handler to be completely replaced by a test case, bypassing any default handler logic, if the default handler function is not desired.
System(s) tested on
Ubuntu 20.04
Additional Context
Originally when the directory reorganization was done (#972) the "core internal" function prototypes were kept in
core_api
because that's where the stubs were, and splitting them would require splitting the stub library.When using generated stubs, this is no longer an issue, and actually flips the problem around - such that to maintain the patterns these header files should be moved so that the stubs are generated properly with the right scope.
As a result - this moves the "internal" header files from core_api to core_private, but does not change them. This is where they really should have been all along.
Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.