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 #697, use POSIX dir implementation on VxWorks6 #706

Merged
merged 1 commit into from
Jan 13, 2021

Conversation

jphickey
Copy link
Contributor

Describe the contribution

Instead of keeping/maintaining a one-off implementation for VxWorks 6, use the POSIX implementation for this module. The only incompatibility is the prototype for mkdir() which is missing the second argument. This can be worked around with a simple compatibility macro that is only enabled for VxWorks 6.x builds. This replaces previous PR #698.

Fixes #697.

Testing performed
Build and run all unit tests
Sanity check CFE

Expected behavior changes
No impact to behavior

System(s) tested on
Ubuntu 20.04 (native)
VxWorks 6.9 (mcp750)

Additional context
The actual posix dir implementation did not change at all - just using it on VxWorks 6.9 too.

Also translates/converts the coverage test cases from vxworks specific to the portable dir implementation, which benefits VxWorks7, RTEMS and POSIX too.

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

Instead of maintaining a one-off implementation for VxWorks 6,
use the POSIX implementation for this module.  The only
incompatibility is the prototype for mkdir() which is missing
the second argument.  This can be worked around with a simple
compatibility macro that is only enabled for VxWorks 6.x builds.
@jphickey jphickey added the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Dec 28, 2020
@astrogeco
Copy link
Contributor

CCB 2021-01-06 APPROVED

@astrogeco astrogeco added CCB-20210106 and removed CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels Jan 11, 2021
@astrogeco astrogeco changed the base branch from main to integration-candidate January 13, 2021 02:40
@astrogeco astrogeco merged commit e9ff3a6 into nasa:integration-candidate Jan 13, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Jan 13, 2021
@jphickey jphickey deleted the fix-697-vxworks6-dir branch January 27, 2021 14:09
@skliper skliper added this to the 6.0.0 milestone Sep 24, 2021
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.

Build broken for VxWorks on RHEL 7
3 participants