Integration Candidate 20200108 #479
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
Use "UtTest_Setup" instead of "OS_Application_Startup" This needs to be merged in coordination with a related change in OSAL/UT Assert. This also updates the UT application final link to use "ut_assert" rather than "ut_bsp", as the separate bsp for unit test is also getting phased out.
On CPUs with strict alignment requirements, some CFE code that uses a char-type pointer (e.g. uint8*) to compute memory addresses triggers an alignment warning when it gets cast back to the actual data type. This code should be alignment-safe already, because the address computation already takes CPU alignment requirements into account when calculating the addresses/offsets. However, the compiler still flags the final conversion from a pointer with no special alignment to something with alignment requirements. - For the CFE_SB pool buffers, using the `cpuaddr` type, which is integer in nature, avoids the warning. - For the CFE_TBL internal table pointer, use a `void*` internally to store the buffer pointer, rather than a `uint8_t*`. This changes the casting needs elsewhere.
This explicitly specifies the BSP to use when using SIMULATION=native flags to the build. All other example toolchain files already included this setting.
issue #427, adding travis.yml for cppcheck on flight
Fix #425, update cppcheck
issue #443, update toolchain-ppc-vxworks6.9
Fix #445, create osal api guide with doxygen
Fix #437: Avoid alignment warnings on some CPUs
Fix #259, Update tone leap variable
Fix #438: Set OSAL_SYSTEM_BSPTYPE for native builds
Fix #435: Update UT entry point Resolve merge conflicts in fsw/cfe-core/unit-test/CMakeLists.txt
skliper
added
the
CCB:Approved
|
CCB 20200115 - Reviewed and approved for merge to master |
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
Merge #428, #432, #436, #439, #444, #446, #450, #453
Fix #259, fix #425, fix #427, fix #435, fix #437, fix #438, fix #443, fix #445
Fix #314
Testing performed
Expected behavior changes
OS timer test should now always pass
System(s) tested on
Additional context
N/A
Third party code
N/A
Contributor Info - All information REQUIRED for consideration of pull request
Jacob Hageman - NASA/GSFC