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

Fast Track for Integration Candidate 2020-06-10 #513

Merged
merged 5 commits into from
Jun 17, 2020

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Jun 17, 2020

Describe the contribution
Fast Tracked Changes to Integration Candidate 2020-06-10

Fix #509
Fix #502

Testing performed
Bundle CI - https://github.com/nasa/cFS/pull/102/checks

Expected behavior changes

PR #503 - Added the following wrappers macros around UtAssert_True for commonly-used asserts:

  • UtAssert_INT32_EQ - check equality as 32 bit signed int
  • UtAssert_UINT32_EQ - check equality as 32 bit unsigned int
  • UtAssert_NOT_NULL - check pointer not null
  • UtAssert_NULL - check pointer is null
  • UtAssert_NONZERO - check integer is nonzero
  • UtAssert_ZERO - check integer is zero
  • UtAssert_STUB_COUNT - check stub count

PR #510 - Using unsigned long instead of uintmax_t to fix support for VxWorks

System(s) tested on
Ubuntu:Bionic

Additional context
Part of nasa/cFS#102

Third party code
None

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

jphickey and others added 4 commits June 16, 2020 10:13
Add the following macros for UT assert:

UtAssert_INT32_EQ - check equality as 32 bit signed int
UtAssert_UINT32_EQ - check equality as 32 bit unsigned int
UtAssert_NOT_NULL - check pointer not null
UtAssert_NULL - check pointer is null
UtAssert_NONZERO - check integer is nonzero
UtAssert_ZERO - check integer is zero
UtAssert_STUB_COUNT - check stub count

These are all just wrappers around UtAssert_True for
commonly-used asserts.  The description message is
auto generated so it is consistent.
Some systems may not provide this type.  Using "unsigned long" instead
should be sufficient.
@astrogeco astrogeco changed the title Integration candidate Fast Track for Integration Candidate 2020-06-10 Jun 17, 2020
@astrogeco astrogeco marked this pull request as ready for review June 17, 2020 21:34
@astrogeco astrogeco merged commit bc73437 into master Jun 17, 2020
@skliper skliper added this to the 5.1.0 milestone Aug 21, 2020
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.

VxWorks 6.9 does not provide uintmax_t type Add int32 UT assert macro
3 participants