Fix #559, Rename set force fail#646
Merged
astrogeco merged 3 commits intonasa:integration-candidatefrom Dec 1, 2020
Merged
Conversation
This was referenced Nov 6, 2020
skliper
approved these changes
Nov 12, 2020
Contributor
|
I'd also recommend instead of using a simple If nothing else this just makes it more like the patterns used elsewhere. The whole thing can go into a |
139a7e7 to
52ee871
Compare
Contributor
|
I recommend avoiding merging main into a feature branch. Preference is to rebase the feature on main. You can always do a soft reset and recommit to fix this. |
e9e05c6 to
48ac38e
Compare
astrogeco
added a commit
to astrogeco/cFS
that referenced
this pull request
Dec 1, 2020
astrogeco
added a commit
to astrogeco/cFS
that referenced
this pull request
Dec 2, 2020
jphickey
pushed a commit
to jphickey/osal
that referenced
this pull request
Aug 10, 2022
Fix nasa#639, Remove ES_APP_DEBUG functionality
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
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
Fixes #559 by changing UT_SetForceFail to UT_SetDefaultReturnValue
Testing performed
Build and run unit test
Expected behavior changes
No impact to behavior
System(s) tested on
Ubuntu 20.04
Additional context
Contributor Info - All information REQUIRED for consideration of pull request
Alex Campbell - NASA/GSFC