Fix #539, build failure in UT stubs with multiple CPUs#542
Merged
astrogeco merged 1 commit intonasa:integration-candidatefrom Mar 18, 2020
Merged
Fix #539, build failure in UT stubs with multiple CPUs#542astrogeco merged 1 commit intonasa:integration-candidatefrom
astrogeco merged 1 commit intonasa:integration-candidatefrom
Conversation
Fix issue regarding inclusion of cfe_platform_cfg.h when multiple CPUs are in use. Also fix for duplicate name collision where different configs exist within the same arch.
jphickey
added
the
CCB:Ready
astrogeco
changed the title
Contributor
|
CCB 20200311 - Approve |
astrogeco
added
CCB:Approved
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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
Fix #539
Removes dependencies on
cfe_platform_cfg.hfrom the unit test stub code. The behavior of the stubs should not be dependent on the FSW runtime config.This also fixes a duplicate name collision where different configs exist within the same architecture, causing a conflict on the UT target names.
Testing performed
Build with ENABLE_UNIT_TESTS=TRUE for both native and cross environments, with both a default config (single CPU/config) and a more complex two CPU config.
Execute unit tests and confirm all passing in all configs.
Expected behavior changes
The two CPU config originally fails and now builds and runs UT with this change.
No changes to FSW, only UT.
System(s) tested on
Ubuntu 18.04 LTS 64 bit
Cross build for 32-bit architecture
Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc. (CLA on file)