Skip to content

Fix #2446, clarify startup token count message - #2792

Open
sylvesterkaczmarek wants to merge 1 commit into
nasa:devfrom
sylvesterkaczmarek:fix-2446-startup-token-count-message
Open

sylvesterkaczmarek wants to merge 1 commit into
nasa:devfrom
sylvesterkaczmarek:fix-2446-startup-token-count-message

Conversation

@sylvesterkaczmarek

@sylvesterkaczmarek sylvesterkaczmarek commented Aug 13, 2026

Copy link
Copy Markdown

Checklist (Please check before submitting)

  • I reviewed the Contributing Guide.
  • I signed and emailed the appropriate Contributor License Agreement.

Describe the contribution

Fix #2446.

Clarify the malformed startup-script diagnostic so the reported value is explicitly identified as NumTokens and the required minimum is stated.

The parser rejects entries with fewer than eight tokens. The previous message printed only the raw count, which could be mistaken for a startup-file entry or line number.

Testing performed

  1. Added regression coverage for the existing zero-token error path.
  2. The test verifies that the diagnostic contains NumTokens = 0, expected at least 8.
  3. NASA Format Check passed.
  4. NASA Static Analysis passed.
  5. NASA Code Coverage Analysis passed.
  6. NASA Code Coverage Analysis with EDS enabled passed.
  7. NASA MCDC Analysis passed.
  8. NASA Functional Test passed.
  9. NASA Functional Test with EDS enabled passed.
  10. NASA cFS Documentation and Guides passed.
  11. NASA CodeQL Analysis passed.

Expected behavior changes

  • API Change: none.
  • Behavior Change: malformed startup-script entries with fewer than eight tokens produce a clearer diagnostic.
  • Startup parsing and error-return behavior are unchanged.

System(s) tested on

  • Repository baseline: cFE dev.
  • Validation: NASA GitHub Actions workflows listed above.

Additional context

The branch is one commit ahead of dev, zero commits behind, and changes only the ES diagnostic plus its regression assertion.

Third party code

None.

Contributor Info - All information REQUIRED for consideration of pull request

Sylvester Kaczmarek, Personal

Latest rebase validation

Rebased onto current dev at 39d765fa568943c50c6a8f7dbc957edc31607900. Preserved the upstream startup-parser refactor and moved the relevant change to cfe_es_startupscript.c. Config, ES, TBL, and TA coverage targets all passed for ten repetitions in a Debian 12 arm64 native configuration with EDS disabled. The local TA fixture supplies its required performance ID. Clang-format 19 and git diff --check passed. New upstream CI results are pending.

@sylvesterkaczmarek
sylvesterkaczmarek marked this pull request as ready for review August 13, 2026 13:12
@sylvesterkaczmarek
sylvesterkaczmarek force-pushed the fix-2446-startup-token-count-message branch from 1d11205 to 9b80353 Compare September 10, 2026 14:50
@sylvesterkaczmarek

Copy link
Copy Markdown
Author

Rebased onto current dev and resolved the conflict by moving the change into the new startup-parser source, preserving the upstream refactor. Config, ES, TBL and Task Affinity coverage targets pass for ten repetitions locally; formatting and diff checks pass. New CI results are pending.

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.

Misleading startup script message

2 participants