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-08-31 #1138

Merged
merged 3 commits into from
Sep 1, 2021
Merged

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Aug 27, 2021

Describe the contribution

PR #1136

Testing performed

osal checks https://github.com/nasa/osal/pull/1138/checks
cFS Bundle Checks https://github.com/nasa/cFS/pull/348/checks

Expected behavior changes
See PRs

System(s) tested on
Ubuntu
RTEMS (bundle)

Additional context
Part of nasa/cFS#348

Third party code
None

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

jphickey and others added 2 commits August 25, 2021 13:41
Add a pair of macros that can confirm a value has bits set or
does not have bits set.  By using bitmask-aware macros, the logged
information can include both the raw/actual value as well as the
specific bits being tested.
@astrogeco astrogeco changed the title osal Integration candidate: 2021-08-27 osal Integration candidate: 2021-08-31 Sep 1, 2021
@astrogeco astrogeco marked this pull request as ready for review September 1, 2021 14:20
@astrogeco astrogeco merged commit 7ebb463 into main Sep 1, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Sep 1, 2021
**Combines**

nasa/cFE#1885,              v6.8.0-rc1+dev980
nasa/osal#1138,             v5.1.0-rc1+dev598
nasa/cFS-GroundSystem#195,  v2.2.0-rc1+dev63

**Includes**

*cFE*

nasa/cFE#1870, Add SB API test cases
nasa/cFE#1869, Add ES API test cases
nasa/cFE#1872, Add TBL API test cases
nasa/cFE#1871, Add FS API test cases
nasa/cFE#1860, Add Time Clock Test
nasa/cFE#1862, EVS coverage test
nasa/cFE#1876, SB test improvements
nasa/cFE#1865, CFE_TBL_Modified: Test CRC, updated flag
nasa/cFE#1881, Improve EVS code coverage
nasa/cFE#1877, add call to CFE_ES_ExitChildTask
nasa/cFE#1902, Incorrect OSAL Format in Users Guide Reference
nasa/cFE#1884, Improve FS coverage
nasa/cFE, Improve MSG branch coverage
nasa/cFE#1891, Improve resource ID branch coverage
nasa/cFE#1894, Improve SBR branch coverage
nasa/cFE#1896, Fix #1895, Improve TIME branch coverage
nasa/cFE#1904, Improve TBL code coverage
nasa/cFE#1864, Support custom PSP directory
nasa/cFE#1913, Update time tests to use bitmask check macros
nasa/cFE#1923, remove extra word in comment

*osal*

nasa/osal#1136, add bitmask assert macros

*cFS-GroundSystem*

nasa/cFS-GroundSystem#190, Fix #189, Virtualenv and Pipenv .gitignore support
nasa/cFS-GroundSystem#194, Fix doc, comment, and message typos

Co-authored-by: Jacob Hageman           <skliper@users.noreply.github.com>
Co-authored-by: Joseph Hickey           <jphickey@users.noreply.github.com>
Co-authored-by: Alex Campbell           <zanzaben@users.noreply.github.com>
Co-authored-by: Ariel Adams             <ArielSAdamsNASA@users.noreply.github.com>
Co-authored-by: Jose F Martinez Pedraza <pepepr08@users.noreply.github.com>
Co-authored-by: Avi                     <thnkslprpt@users.noreply.github.com>
Co-authored-by: Paul                    <pavll@users.noreply.github.com>
@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.

Add UtAssert bit field check macros
3 participants