Skip to content
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 #939, rework shell test #940

Merged
merged 1 commit into from
Apr 12, 2021

Conversation

jphickey
Copy link
Contributor

@jphickey jphickey commented Apr 1, 2021

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.

@jphickey jphickey added the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Apr 1, 2021
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.
@astrogeco
Copy link
Contributor

CCB:2021-04-07 APPROVED

  • Fixes test

@astrogeco astrogeco added CCB:Approved Indicates code review and approval by community CCB and removed CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels Apr 7, 2021
@astrogeco astrogeco changed the base branch from main to integration-candidate April 11, 2021 19:07
@astrogeco astrogeco merged commit b2c2406 into nasa:integration-candidate Apr 12, 2021
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 jphickey deleted the fix-939-shell-test branch April 28, 2021 18:58
@skliper skliper added this to the 6.0.0 milestone Sep 24, 2021
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CCB:Approved Indicates code review and approval by community CCB
Projects
None yet
Development

Successfully merging this pull request may close these issues.

shell-test does not appear to work on VxWorks
4 participants