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.

Sign up for GitHub

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

cFE Integration candidate: Equuleus-rc1+dev12 #2563

Merged

dzbaker merged 5 commits into main from integration-candidate2

May 21, 2024

Collaborator

dzbaker commented May 21, 2024 •

edited

Loading

Checklist (Please check before submitting)

I reviewed the Contributing Guide.
I signed and emailed the appropriate Contributor License Agreement to [email protected] and copied [email protected].

Describe the contribution

PR Fix #2561, send CMake message to stdout instead of stderr #2525. Addresses Issue Send informational CMake message(s) to stdout instead of stderr #2561
PR Fix #2536, msg api test buffer overrun #2537. Addresses Issue Improper stack object access in the msg api functional test #2536

Testing performed
cFS Bundle Checks
cFE Checks

Expected behavior changes
See PRs

System(s) tested on
Ubuntu 20.04

Additional context
Add any other context about the contribution here.

Third party code
If included, identify any third party code and provide text file of license

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

Codym48 and others added 5 commits

March 8, 2024 12:45


Send CMake message to stdout instead of stderr

4e46fe0


Fix #2536, rework msg API test for secondary headers

24a2b21

For secondary header checks, different functions may (or may not) be
implemented on commands vs telemetry.  The functional test must not
assume one or the other is implemented.  It should dynamically check
both checksum and timestamp based on the return value of the API call.


Merge pull request #2537 from jphickey:fix-2536-msgapi-buffer

19a01d2

Fix #2536, msg api test buffer overrun


Merge pull request #2525 from Codym48:cmartin/status-stdout

Fix #2561, send CMake message to stdout instead of stderr


Updating documentation and version numbers for equuleus-rc1+dev137

4ea2b0c

github-advanced-security bot found potential problems

View reviewed changes

modules/cfe_testcase/src/msg_api_test.c

- UtAssert_INT32_EQ(CFE_MSG_SetType(CFE_MSG_PTR(cmd2), CFE_MSG_Type_Cmd), CFE_SUCCESS);
+ /* test generate-checksum on commands */
+ CFE_Assert_STATUS_STORE(CFE_MSG_ValidateChecksum(CFE_MSG_PTR(cmd), &isValid));
+ if (CFE_Assert_STATUS_MAY_BE(CFE_SUCCESS))

Check warning

Code scanning / CodeQL

Side effect in a Boolean expression Warning test

This Boolean expression is not side-effect free.

modules/cfe_testcase/src/msg_api_test.c

+ UtAssert_INT32_EQ(CFE_MSG_ValidateChecksum(CFE_MSG_PTR(cmd), &isValid), CFE_SUCCESS);
+ UtAssert_BOOL_TRUE(isValid);
+ }
+ else if (CFE_Assert_STATUS_MAY_BE(CFE_MSG_WRONG_MSG_TYPE))

Check warning

Code scanning / CodeQL

Side effect in a Boolean expression Warning test

This Boolean expression is not side-effect free.

modules/cfe_testcase/src/msg_api_test.c

- UtAssert_True(isValid, "Checksum isValid (%d) = true", isValid);
+ /* test generate-checksum on telemetry */
+ CFE_Assert_STATUS_STORE(CFE_MSG_ValidateChecksum(CFE_MSG_PTR(tlm), &isValid));
+ if (CFE_Assert_STATUS_MAY_BE(CFE_SUCCESS))

Check warning

Code scanning / CodeQL

Side effect in a Boolean expression Warning test

This Boolean expression is not side-effect free.

modules/cfe_testcase/src/msg_api_test.c

- if (!CFE_Assert_STATUS_MAY_BE(CFE_SUCCESS))
+ /* Check if GetMsgTime is implemented on commands */
+ CFE_Assert_STATUS_STORE(CFE_MSG_GetMsgTime(CFE_MSG_PTR(cmd), &msgTime));
+ if (CFE_Assert_STATUS_MAY_BE(CFE_SUCCESS))

Check warning

Code scanning / CodeQL

Side effect in a Boolean expression Warning test

This Boolean expression is not side-effect free.

modules/cfe_testcase/src/msg_api_test.c

- UtAssert_UINT32_EQ(CFE_TIME_Compare(msgTime, currentTime), CFE_TIME_EQUAL);
+ /* Check if GetMsgTime is implemented on telemetry */
+ CFE_Assert_STATUS_STORE(CFE_MSG_GetMsgTime(CFE_MSG_PTR(tlm), &msgTime));
+ if (CFE_Assert_STATUS_MAY_BE(CFE_SUCCESS))

Check warning

Code scanning / CodeQL

Side effect in a Boolean expression Warning test

This Boolean expression is not side-effect free.

modules/cfe_testcase/src/msg_api_test.c

+ UtAssert_INT32_EQ(CFE_MSG_ValidateChecksum(CFE_MSG_PTR(tlm), &isValid), CFE_SUCCESS);
+ UtAssert_BOOL_TRUE(isValid);
+ }
+ else if (CFE_Assert_STATUS_MAY_BE(CFE_MSG_WRONG_MSG_TYPE))

Check warning

Code scanning / CodeQL

Side effect in a Boolean expression Warning test

This Boolean expression is not side-effect free.

modules/cfe_testcase/src/msg_api_test.c

- CFE_Assert_STATUS_STORE(CFE_MSG_SetMsgTime(CFE_MSG_PTR(cmd2), currentTime));
- if (!CFE_Assert_STATUS_MAY_BE(CFE_SUCCESS))
+ else if (CFE_Assert_STATUS_MAY_BE(CFE_MSG_WRONG_MSG_TYPE))

Check warning

Code scanning / CodeQL

Side effect in a Boolean expression Warning test

This Boolean expression is not side-effect free.

modules/cfe_testcase/src/msg_api_test.c

+ UtAssert_INT32_EQ(CFE_MSG_GetMsgTime(CFE_MSG_PTR(tlm), &msgTime), CFE_SUCCESS);
+ UtAssert_UINT32_EQ(CFE_TIME_Compare(msgTime, currentTime), CFE_TIME_EQUAL);
+ }
+ else if (CFE_Assert_STATUS_MAY_BE(CFE_MSG_WRONG_MSG_TYPE))

Check warning

Code scanning / CodeQL

Side effect in a Boolean expression Warning test

This Boolean expression is not side-effect free.

dzbaker merged commit 505baa1 into main

40 of 41 checks passed

dzbaker deleted the integration-candidate2 branch

August 30, 2024 15:31

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment