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

Fix #539, build failure in UT stubs with multiple CPUs #542

Merged
merged 1 commit into from
Mar 18, 2020

Conversation

jphickey
Copy link
Contributor

@jphickey jphickey commented Mar 4, 2020

Describe the contribution

Fix #539

Removes dependencies on cfe_platform_cfg.h from 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)

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 jphickey added the CCB:Ready Ready for discussion at the Configuration Control Board (CCB) label Mar 4, 2020
@astrogeco astrogeco changed the title Fix build failure in UT stubs with multiple CPUs Fix #539, build failure in UT stubs with multiple CPUs Mar 10, 2020
@astrogeco astrogeco added this to the 6.8.0 milestone Mar 10, 2020
@astrogeco
Copy link
Contributor

CCB 20200311 - Approve

@astrogeco astrogeco added CCB:Approved Indicates code review and approval by community CCB and removed CCB:Ready Ready for discussion at the Configuration Control Board (CCB) labels Mar 13, 2020
@astrogeco astrogeco changed the base branch from master to integration-candidate March 18, 2020 12:34
@astrogeco astrogeco merged commit 1978d64 into nasa:integration-candidate Mar 18, 2020
@jphickey jphickey deleted the fix-539-ut-buildfail branch April 6, 2020 12:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CCB:Approved Indicates code review and approval by community CCB
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unit test build fails when multiple CPUs are defined
2 participants