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 #305, do not override add_psp_module for coverage test #306

Merged

Conversation

jphickey
Copy link
Contributor

@jphickey jphickey commented Sep 3, 2021

Describe the contribution
Implements a differently-named function instead, which does mostly the same thing as the override had done, but does not directly re-add the original subdirectory. This does repeat some info (e.g. the list of FSW source files) that was not repeated otherwise, but it works in general.

Fixes #305

Testing performed
Build and sanity check CFE in a configuration that uses several PSP modules for Hardware access

Expected behavior changes
CMake builds the FSW modules correctly

System(s) tested on
Ubuntu

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

@jphickey jphickey added the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Sep 3, 2021
Implements a differently-named function instead, which does mostly the same thing,
but does not directly re-add the original subdirectory.  This does repeat some
info (e.g. the list of FSW source files) that was not repeated otherwise, but
it works in general.
@skliper
Copy link
Contributor

skliper commented Sep 3, 2021

@excaliburtb @tngo67 - could you review and let me know if this would this impact your distribution?

@excaliburtb
Copy link

This doesn't appear to be a problem for us.

@astrogeco astrogeco changed the base branch from main to integration-candidate September 7, 2021 22:05
@astrogeco astrogeco merged commit b07dab3 into nasa:integration-candidate Sep 7, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Sep 7, 2021
@astrogeco astrogeco added CCB:Approved Indicates Approval by CCB and removed CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels Sep 8, 2021
@astrogeco
Copy link
Contributor

astrogeco commented Sep 8, 2021

CCB:2021-09-08 APPROVED

  • Makes it easier to add more tests

astrogeco added a commit to nasa/cFS that referenced this pull request Sep 10, 2021
**Combines**

nasa/cFE#1939, v6.8.0-rc1+dev994
nasa/osal#1145, v5.1.0-rc1+dev604
nasa/PSP#307, v1.5.0-rc1+dev124
nasa/sch_lab#87, v2.4.0-rc1+dev47

**Includes**

*cFE*

nasa/cFE#1903, Update directory diagrams in application developer guide

nasa/cFE#1922, SB code coverage improvements #1905, Improve SB coverage

nasa/cFE#1936, Improve ES code coverage

nasa/cFE#1938, Enforce minimum code coverage

nasa/cFE#1940, Update dev guide for MSG and SBR

nasa/cFE#1941, Support unimplemented features in MSG FT

*osal*

nasa/osal#1144, Regex update in coverage enforcement to match .0

nasa/osal#1142, Add typecast to memchr call

*psp*

nasa/PSP#307, check that module type is not invalid

nasa/PSP#306, do not override add_psp_module for coverage test

*sch_lab*

nasa/sch_lab#86, add CmdCode to sch_lab_table

nasa/sch_lab#88, Fix missing typedef

Co-authored-by: Jacob Hageman           <[email protected]>
Co-authored-by: Joseph Hickey           <[email protected]>
Co-authored-by: Ariel Adams             <[email protected]>
Co-authored-by: Jose F Martinez Pedraza <[email protected]>
@jphickey jphickey deleted the fix-305-pspmod-covtest branch October 18, 2022 13:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Override of "add_psp_module" for coverage test gets global scope
4 participants