cFE Integration candidate: 2021-09-21 #1967
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some CFE API headers were missing dependency inclusions, where the header was referencing a type or symbol but not directly including the header file that provides that type/symbol. Adding the dependent include allows the headers to work more consistently.
Replace "CFE_UtAssert" macro prefix with "CFE_Assert", to match the naming convention. (The "UtAssert" was a carry over from the coverage test environment).
Updates the test case for "CFE_MSG_SetMsgId()" to write a value that is outside the set of storable values for MsgId. This test has a caveat that it is somewhat implementation-dependent, but by passing a MsgId value with all bits set, at least one of those bits is likely not correlated with a real header bit.
Fix #1835, CFE_Assert macro names
Fix #1949, update msgid testcase to match implementation
Fix #1961, Single time domain in functional time tests
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Sep 21, 2021
*Combines* nasa/cFE#1967 *Includes:* nasa/cFE#1948, Update name of macros/functions added to "cfe_assert" nasa/cFE#1950, Fix Mismatch between MSG API and test case in "TestMsgId" functional test nasa/cFE#1962, Single time domain in functional time tests
2 tasks
Fix #1942, add missing inclusions in CFE API headers
Fix #1963, Use existing /ram for FS header test
Fix #1955, Add static local to function test so data section is nonzero
Fix #1957, Functional CRC converted to MIR to handle different implementations
Fix #1951, Only check base filename in library info functional
Fix #1959, Make invalid buffer length consistent in es task test
Errant CFE_UtAssert snuck in with merge of #1960
Fix #1969, Confirm sb/time reset requirements in coverage test
Fixes broken section anchor link in table of contents
Use an intermediate variable of type CFE_ES_MemPoolBuf_t to store the address.
astrogeco
force-pushed
the
integration-candidate
branch
from
fe8de61
to
a9cf2aa
Compare
Fix #1971, avoid alias warning on some compilers
astrogeco
force-pushed
the
integration-candidate
branch
from
02cb5db
to
22952e0
Compare
astrogeco
force-pushed
the
integration-candidate
branch
from
22952e0
to
0352be0
Compare
astrogeco
added a commit
to astrogeco/cFS
that referenced
this pull request
Sep 22, 2021
**Combines** nasa/cFE#1967 v6.8.0-rc1+dev1024 nasa/osal#1158 v5.1.0-rc1+dev619 nasa/sch_lab#92 v2.4.0-rc1+dev53 nasa/sample_app#155 v1.2.0-rc1+dev73 nasa/to_lab#105 v2.4.0-rc1+dev58 nasa/ci_lab#93 v2.4.0-rc1+dev46 **Includes:** *cFE* nasa/cFE#1948, Update name of macros/functions added to "cfe_assert" nasa/cFE#1950, Fix Mismatch between MSG API and test case in "TestMsgId" functional test nasa/cFE#1962, Single time domain in functional time tests nasa/cFE#1943, add missing inclusions in CFE API headers nasa/cFE#1964, Use existing /ram for FS header test nasa/cFE#1956, Add static local to function test so data section is nonzero nasa/cFE#1960, Make invalid buffer length consistent in es task test nasa/cFE#1953, Only check base filename in library info functional nasa/cFE#1970, Confirm sb/time reset requirements in coverage test nasa/cFE#1947, Fix broken link in App Developers Guide nasa/cFE#1972, Fix #1971, avoid alias warning on some compilers *osal* nas/osal#1149, Enable symbol api test and MIR dump too large nasa/osal#1152, Fix OSAL loader test hard fails if size exceeded nasa/osal#1155, add bsp-specific configuration flag registry nasa/osal#1157, Add os-specifc socket flag function *Apps* nasa/ci_lab#92, Apply CFE_SB_ValueToMsgId where required nasa/sample_app#154, Apply CFE_SB_ValueToMsgId where required nasa/sch_lab#91, Apply CFE_SB_ValueToMsgId where required nasa/to_lab#104, Apply CFE_SB_ValueToMsgId where required Co-authored-by: Jacob Hageman <skliper@users.noreply.github.com> Co-authored-by: Joseph Hickey <jphickey@users.noreply.github.com> Co-authored-by: Adrien Chardon <nodraak@users.noreply.github.com>
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Sep 22, 2021
**Combines** nasa/cFE#1967 v6.8.0-rc1+dev1024 nasa/osal#1158 v5.1.0-rc1+dev619 nasa/sch_lab#92 v2.4.0-rc1+dev53 nasa/sample_app#155 v1.2.0-rc1+dev73 nasa/to_lab#105 v2.4.0-rc1+dev58 nasa/ci_lab#93 v2.4.0-rc1+dev46 **Includes:** *cFE* nasa/cFE#1948, Update name of macros/functions added to "cfe_assert" nasa/cFE#1950, Fix Mismatch between MSG API and test case in "TestMsgId" functional test nasa/cFE#1962, Single time domain in functional time tests nasa/cFE#1943, add missing inclusions in CFE API headers nasa/cFE#1964, Use existing /ram for FS header test nasa/cFE#1956, Add static local to function test so data section is nonzero nasa/cFE#1960, Make invalid buffer length consistent in es task test nasa/cFE#1953, Only check base filename in library info functional nasa/cFE#1970, Confirm sb/time reset requirements in coverage test nasa/cFE#1947, Fix broken link in App Developers Guide nasa/cFE#1972, Fix #1971, avoid alias warning on some compilers *osal* nas/osal#1149, Enable symbol api test and MIR dump too large nasa/osal#1152, Fix OSAL loader test hard fails if size exceeded nasa/osal#1155, add bsp-specific configuration flag registry nasa/osal#1157, Add os-specifc socket flag function *Apps* nasa/ci_lab#92, Apply CFE_SB_ValueToMsgId where required nasa/sample_app#154, Apply CFE_SB_ValueToMsgId where required nasa/sch_lab#91, Apply CFE_SB_ValueToMsgId where required nasa/to_lab#104, Apply CFE_SB_ValueToMsgId where required Co-authored-by: Jacob Hageman <skliper@users.noreply.github.com> Co-authored-by: Joseph Hickey <jphickey@users.noreply.github.com> Co-authored-by: Adrien Chardon <nodraak@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Describe the contribution
PR #1948
PR #1950
PR #1962
PR #1943
PR #1964
PR #1956
PR #1960
PR #1953
PR #1970
PR #1947
PR#1972
Testing performed
cFE Checks https://github.com/nasa/cFE/pull/1967/checks
cFS Bundle Checks https://github.com/nasa/cFS/pull/359/checks
Expected behavior changes
See PRs
System(s) tested on
Ubuntu
RTEMS (see cFS bundle PR)
Additional context
Part of nasa/cFS#359
Third party code
none
Contributor Info - All information REQUIRED for consideration of pull request
@jphickey
@skliper
@Nodraak