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 #204, redefinition of macros in PPC vxworks unit test build #205

Merged
merged 1 commit into from
Oct 13, 2020

Conversation

jphickey
Copy link
Contributor

@jphickey jphickey commented Oct 7, 2020

Describe the contribution
Fix #204
Resolves build error regarding redefinition of PPC macros in the coverage test, when building on the actual ppc/vxworks target.

This is due to the fact that the system limits.h file implicitly provides these PPC symbols. It does not appear that there are
any current test cases that depend on values of these symbols.

Testing performed
Build verification only at this time (resolves compile error)

Expected behavior changes
None

System(s) tested on
GSFC vxworks build machine (gs582w-cfelnx)

Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.

Resolves build error regarding redefinition of PPC macros in the
coverage test, when building on the actual ppc/vxworks target.

This is due to the fact that the system limits.h file implicitly
provides these PPC symbols.  It does not appear that there are
any current test cases that depend on values of these symbols.
@jphickey jphickey added the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Oct 7, 2020
@astrogeco astrogeco added CCB-20201006 and removed CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels Oct 7, 2020
@astrogeco
Copy link
Contributor

CCB 2020-10-06 APPROVED

@astrogeco astrogeco changed the base branch from main to integration-candidate October 13, 2020 00:23
@astrogeco astrogeco merged commit bb939b7 into integration-candidate Oct 13, 2020
astrogeco added a commit to nasa/cFS that referenced this pull request Oct 13, 2020
@jphickey jphickey deleted the fix-204-vx-ppc-ut-redefinition branch January 6, 2021 19:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants