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

osal Integration candidate: 2021-09-07 #1145

Merged
merged 5 commits into from
Sep 10, 2021
Merged

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Sep 8, 2021

Describe the contribution
PR #1142

PR #1144

Testing performed

osal Checks https://github.com/nasa/osal/pull/1145/checks
cFS Bundle Checks https://github.com/nasa/cfs/pull/351/checks

Expected behavior changes
See PRs

System(s) tested on
Ubuntu CI

Additional context
Part of nasa/cFS#351

Third party code
None

Contributor Info - All information REQUIRED for consideration of pull request
@skliper
@jphickey

jphickey and others added 4 commits September 7, 2021 11:30
This function is documented as returning `void*`, and on some compilers
this requires an explicit cast to `const char*` to avoid a warning.
Fix #1143, Regex update in coverage enforcement to match .0
@astrogeco astrogeco marked this pull request as draft September 8, 2021 16:26
astrogeco added a commit to nasa/cFS that referenced this pull request Sep 8, 2021
nasa/osal#1142, Add typecast to memchr call
astrogeco added a commit to nasa/cFS that referenced this pull request Sep 8, 2021
nasa/osal#1144, Regex update in coverage enforcement to match .0

nasa/osal#1142, Add typecast to memchr call
@astrogeco astrogeco marked this pull request as ready for review September 10, 2021 14:16
@astrogeco astrogeco merged commit 50f6dd5 into main Sep 10, 2021
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]>
@skliper skliper added this to the 6.0.0 milestone Sep 24, 2021
jphickey pushed a commit to jphickey/osal that referenced this pull request Aug 10, 2022
jphickey pushed a commit to jphickey/osal that referenced this pull request Aug 10, 2022
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.

Coverage verification will fail if percentage is a round number Typecast memcchr in os-shared-common.h
3 participants