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 #1774, replace VOIDCALL assert macro #1796

Merged

Conversation

jphickey
Copy link
Contributor

Describe the contribution
Use the generic UtAssert_VOIDCALL macro now provided from UtAssert, rather than a local macro in cfe_testcase app.

Fixes #1774

Testing performed
Build and run all tests

Expected behavior changes
None (macros are equivalent)

System(s) tested on
Ubuntu

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

Use the generic UtAssert_VOIDCALL macro now provided from UtAssert,
rather than a local macro in cfe_testcase app.
@jphickey jphickey added the CCB:Ready Ready for discussion at the Configuration Control Board (CCB) label Aug 10, 2021
@astrogeco astrogeco requested a review from zanzaben August 10, 2021 18:47
@astrogeco astrogeco changed the base branch from main to integration-candidate August 10, 2021 19:23
@astrogeco astrogeco merged commit 25112ec into nasa:integration-candidate Aug 10, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Aug 10, 2021
- nasa/cFE#1781, RTEMS CFE_FT_Global build failure
- nasa/cFE#1796, replace VOIDCALL assert macro
astrogeco added a commit to nasa/cFS that referenced this pull request Aug 11, 2021
**Combines**

- nasa/cFE#1772, v6.8.0-rc1+dev844
- nasa/osal#1127, v5.1.0-rc1+dev590

**Includes**

*cFE*

- nasa/cFE#1737, Move global count into test global struct.
- nasa/cFE#1722, Add ES application control API functional tests
- nasa/cFE#1743, Update coverage test to use UtAssert macros
- nasa/cFE#1734, Add table api functional tests
- nasa/cFE#1753, Add Generic Counter API test
- nasa/cFE#1766, finish ES misc API functional test
- nasa/cFE#1764, last char truncated in coverage log output
- nasa/cFE#1728, Mistakes in some copyright headers
- nasa/cFE#1767, Add misc time api functional test cFE
- nasa/cFE#1749, Add Functional Test for EVS Reset Filters API
- nasa/cFE#1781, RTEMS CFE_FT_Global build failure
- nasa/cFE#1796, replace VOIDCALL assert macro

*osal*

- nasa/osal#1117, Add absolute branch coverage check
astrogeco added a commit to nasa/cFS that referenced this pull request Aug 11, 2021
**Combines**

- nasa/cFE#1772, v6.8.0-rc1+dev844
- nasa/osal#1127, v5.1.0-rc1+dev590

**Includes**

*cFE*

- nasa/cFE#1737, Move global count into test global struct.
- nasa/cFE#1722, Add ES application control API functional tests
- nasa/cFE#1743, Update coverage test to use UtAssert macros
- nasa/cFE#1734, Add table api functional tests
- nasa/cFE#1753, Add Generic Counter API test
- nasa/cFE#1766, finish ES misc API functional test
- nasa/cFE#1764, last char truncated in coverage log output
- nasa/cFE#1728, Mistakes in some copyright headers
- nasa/cFE#1767, Add misc time api functional test cFE
- nasa/cFE#1749, Add Functional Test for EVS Reset Filters API
- nasa/cFE#1781, RTEMS CFE_FT_Global build failure
- nasa/cFE#1796, replace VOIDCALL assert macro

*osal*

- nasa/osal#1117, Add absolute branch coverage check

Co-authored-by: Joseph Hickey <[email protected]>
Co-authored-by: Alex Campbell <[email protected]>
Co-authored-by: Niall Mullane <[email protected]>
Co-authored-by: Paul <[email protected]>
@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 Aug 11, 2021
@astrogeco
Copy link
Contributor

CCB:2021-08-11 APPROVED

@jphickey jphickey deleted the fix-1774-replace-voidcall-macro branch August 11, 2021 19:04
@skliper skliper added this to the 7.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
CCB:Approved Indicates code review and approval by community CCB
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Replace cFE_FTAssert_VOIDCALL with new UtAssert_VOIDCALL
4 participants