Integration Candidate 2020-04-08 #615
Merged
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
Bring the example toolchain for i686-rtems4.11 back into sync with the current PSP and platform build module for this system.
Moves prototype into cfe_sb.h, moves code from private to the msg_id_util area. Also added abstracted defines for packet types. Adds the unit test stub and updated the standards comments to reflect the current process.
Use the INTERFACE_COMPILE_DEFINITIONS and INTERFACE_INCLUDE_DIRECTORIES properties from the osal target and apply them to the entire CFE build. At this time, the OSAL library build does not use/export these properties so this is effectively a no-op for the CFE build and can be merged with no effect. However, in a future version, the OSAL library will export these interface properties and this will become important.
OSAL now sets these as UT_COVERAGE_COMPILE_FLAGS, UT_COVERAGE_LINK_FLAGS. Building and linking the UT executable needs a corresponding update.
Fix #543, Expose CFE_SB_GetPktType
Fix #581, Propagate the OSAL compile definitions to CFE build
Fix #573, Update RTEMS example toolchain
astrogeco
changed the title
Fix #612, Update coverage compile/link flag options
astrogeco
changed the title
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
Fixes #573, #543, #581, and #612
See Bundle IC at nasa/cFS#66
Testing performed
See PRs
Bundle CI - https://travis-ci.com/github/nasa/cFS/builds/160607248
Expected behavior changes
PR #574 - Builds without error.
PR #593 - No changes, exposes CFE_SB_GetPktType and adds the stub.
PR #585 - Use the
INTERFACE_COMPILE_DEFINITIONSandINTERFACE_INCLUDE_DIRECTORIESproperties from the osal target and apply them to the entire CFE build as a directory-scope property. No impact until these are set in OSAL.PR #613 - Coverage data (make lcov) again includes the CFE core code
System(s) tested on
See PRs,
Bundle CI - Ubuntu:Bionic
Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.
Jacob Hageman - NASA/GSFC