Fix #939, rework shell test#940
Merged
astrogeco merged 1 commit intonasa:integration-candidatefrom Apr 12, 2021
Merged
Conversation
jphickey
added
the
CCB:Ready
The shell may add extra output beyond the intended content, but the shell-test was only looking for exact match. Extra output may include whitespace and/or an echo of the command itself. This reworks the shell test to allow for this extra output, as long as the intended string appears in the content of the file it will pass.
jphickey
force-pushed
the
fix-939-shell-test
branch
from
a8cdd89 to
84b12d8
Compare
zanzaben
approved these changes
Apr 2, 2021
Contributor
|
CCB:2021-04-07 APPROVED
|
astrogeco
added
CCB:Approved
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Apr 12, 2021
Combines nasa/osal#956 nasa/cFE#1295 Including: nasa/osal#941 - Allow OSAL re-initialization nasa/osal#941 - Combine initialized and shutdown flags into one nasa/osal#948 - Add OS_API_Teardown nasa/osal#948 - Black Box Unit Tests Do Not Ensure Resources Are Cleaned Up Between Tests nasa/osal#940 - Rework shell test nasa/cFE#1276 - Use events for CFE test asserts
jphickey
added a commit
to jphickey/osal
that referenced
this pull request
Aug 10, 2022
Add the system-specific module suffix (.o, .so, .obj, etc) and the default CFE core executable name to the configdata structure. This information has several useful purposes.
jphickey
added a commit
to jphickey/osal
that referenced
this pull request
Aug 10, 2022
Adds an #ifndef empty string for the two new fields, which at the very least prevents IDEs (e.g. Eclipse) from redlining the value as an undefined symbol. (It is always passed in on command line when building via CMake)
jphickey
pushed a commit
to jphickey/osal
that referenced
this pull request
Aug 10, 2022
Fix nasa#940, Add module suffix and core name to configdata
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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
The shell may add extra output beyond the intended content, but the shell-test was only looking for exact match. Extra output may include whitespace and/or an echo of the command itself.
This reworks the shell test to allow for this extra output, as long as the intended string appears in the content of the file it will
pass.
Fixes #939
Testing performed
Build and run the shell test
Note this requires modifying the osal config to enable shell, otherwise test is skipped.
Expected behavior changes
Test passes.
System(s) tested on
Ubuntu 20.04 (native, posix)
MCP750 vworks6.9
Additional context
Not clear how this test ever worked... maybe different versions of VxWorks work differently here. But this approach should (hopefully) be a little more agnostic to the platform-specific shell behavior.
Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.