-
Notifications
You must be signed in to change notification settings - Fork 204
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 #1330, better warning about malformed startup line #1370
Merged
astrogeco
merged 2 commits into
nasa:integration-candidate
from
jphickey:fix-1330-startup-warning
Apr 28, 2021
Merged
Fix #1330, better warning about malformed startup line #1370
astrogeco
merged 2 commits into
nasa:integration-candidate
from
jphickey:fix-1330-startup-warning
Apr 28, 2021
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
This improves the log message when a line in the startup script is not formed correctly, such as being too long or having too many tokens.
jphickey
force-pushed
the
fix-1330-startup-warning
branch
from
April 16, 2021 20:47
95916a8
to
469d970
Compare
jphickey
added
the
CCB:Ready
Ready for discussion at the Configuration Control Board (CCB)
label
Apr 16, 2021
skliper
reviewed
Apr 18, 2021
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like this may need a coverage test for too many tokens? I only see line too long tested.
CCB:2021-04-21 APPROVED |
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
Apr 28, 2021
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Apr 28, 2021
nasa/cFE#1379, memory pool pointer type nasa/cFE#1289, ES child task functional test nasa/cFE#1289, typo in macro name nasa/cFE#1286, Remove broken BUILDDIR reference nasa/cFE#1305, remove option for "osal_compatible" nasa/cFE#1374, CFE_SUCCESS constant type nasa/cFE#1316, Remove Unused Error Codes nasa/cFE#1370, better warning about malformed startup line nasa/cFE#1373, check status of call to `CFE_ES_CDS_CachePreload` nasa/cFE#1384, update documentation for `CFE_ES_DeleteCDS`
This was referenced Apr 28, 2021
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Apr 29, 2021
Combines: nasa/cFE#1431 nasa/osal#975 nasa/sample_lib#61 Includes: nasa/cFE#1379, memory pool pointer type nasa/cFE#1289, ES child task functional test nasa/cFE#1289, typo in macro name nasa/cFE#1286, Remove broken BUILDDIR reference nasa/cFE#1305, remove option for "osal_compatible" nasa/cFE#1374, CFE_SUCCESS constant type nasa/cFE#1316, Remove Unused Error Codes nasa/cFE#1370, better warning about malformed startup line nasa/cFE#1373, check status of call to `CFE_ES_CDS_CachePreload` nasa/cFE#1384, update documentation for `CFE_ES_DeleteCDS` nasa/cFE#1385, exception logic when app/task is not found nasa/cFE#1372, error if alignment size not a power of two nasa/cFE#1368, remove unneeded CFE_ES_SYSLOG_APPEND macro nasa/cFE#1382, improve documentation for resourceID patterns nasa/cFE#1371, assert `CFE_RESOURCEID_MAX` is a bitmask nasa/osal#972, update documentation for read/write nasa/osal#966, add "handler" feature to utassert stub API nasa/osal#953, Adds local makefile and bundle/local unit test actions with coverage verification nasa/osal#971, socket accept using incorrect record nasa/osal#959, move async console option nasa/sample_lib#60, replace direct ref to ArgPtr with macro
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
This improves the log message when a line in the startup script is not formed correctly, such as being too long or having too many
tokens.
Fixes #1330
Testing performed
Hack CFE startup file to have a bad line with too many tokens. Confirm that all other apps started OK.
Expected behavior changes
None if startup script is correctly formed. But Startup file line with too many tokens now generates a more concise warning as opposed to being silent. This also adds an indicator of which is the actual bad line. Example.
System(s) tested on
Ubuntu 20.04
Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.