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 #275, Add stub for CFE_PSP_GetKernelTextSegmentInfo #276

Merged
merged 2 commits into from
Mar 31, 2021

Conversation

ejtimmon
Copy link
Contributor

@ejtimmon ejtimmon commented Mar 18, 2021

Describe the contribution
Fix #275, Adds a UT stub for CFE_PSP_GetKernelTextSegmentInfo

Testing performed
Applied the patch and confirmed that CS Cmake unit tests build.

Expected behavior changes
Unit tests relying on CFE_PSP_GetKernelTextSegmentInfo will build.

System(s) tested on

  • Ubuntu 18.04
  • Main branch of cFS bundle

Contributor Info - All information REQUIRED for consideration of pull request

  • Elizabeth Timmons/NASA GSFC

@skliper skliper added this to the 1.6.0 milestone Mar 22, 2021
@skliper
Copy link
Contributor

skliper commented Mar 22, 2021

Added "Fix #275" to description to auto-link. Also needs formatting. I have a script in my bin directory:

#!/bin/sh

# Needs a .clang-format style in the path

find . -name "*.[ch]" -exec clang-format-10 -i -style=file {} +

Which you can run from anywhere within the cFS bundle directory (will recursively format from the directory it's run in).

@astrogeco astrogeco added the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Mar 24, 2021
@astrogeco
Copy link
Contributor

CCB:2021-03-24 APPROVED

  • Squash commits

@astrogeco
Copy link
Contributor

@ejtimmon can you squash these two commits?
To do so do the following:

git checkout main
git pull
git checkout fix-275-AddStub
git rebase main -i

at this point you'll get a vi or other editor with the following items

pick Fix #275, Add stub for CFE_PSP_GetKernelTextSegmentInfo
pick Updated to match formatting. 

edit this so it looks like

pick Fix #275, Add stub for CFE_PSP_GetKernelTextSegmentInfo
s Updated to match formatting. 

Then save and exit. A new editor will pop up asking you to choose one of the commit messages. You can delete the one that says Updated to match formatting. then save and exit.

Finally run git push --force which will then result in a new commit hash being uploaded to github

@skliper
Copy link
Contributor

skliper commented Mar 24, 2021

If you use f instead of s it'll just use the picked commit message.

@astrogeco
Copy link
Contributor

^mind blown

@astrogeco astrogeco changed the base branch from main to integration-candidate March 31, 2021 17:43
@astrogeco astrogeco merged commit 5535df4 into nasa:integration-candidate Mar 31, 2021
@astrogeco astrogeco removed the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Mar 31, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Mar 31, 2021
nasa/cFE#1260 - Fix #1259, adds --branch-coverage option to genhtml line in lcov Makefile rule

nasa/osal#915 - Fix #888, better return codes from OS_SymbolTableDump_Impl
nasa/osal#926 - Fix #853, remove OS_TaskRegister
nasa/osal#935 - Fix #934, Remove unused SCRIPT_MODE flag
nasa/osal#930 - Fix #929, use test function for osal_id_t

nasa/PSP#276 - Fix #275, Adds a UT stub for CFE_PSP_GetKernelTextSegmentInfo

nasa/ci_lab#84 - Fix #73, use zero copy API
nasa/sample_app#143 - Fix #142, scrub header guards
astrogeco added a commit to nasa/cFS that referenced this pull request Apr 1, 2021
nasa/cFE#1237 - Fix #1180, Removes impossible conditions
nasa/cFE#1240 - Fix #1002, Remove deprecated elements
nasa/cFE#1253 - Fix #1252, Squash potentially uninitialized variable warnings
nasa/cFE#1241 - Fix #1185, Squash possible uninitialized variable false alarms
nasa/cFE#1247 - Fix #1246, Typo in CFE_TBL_Validate AppName
nasa/cFE#1234 - Fix #1192, Initialize TotalMsgSize in CFE_SB_GetUserDataLength
nasa/cFE#1245 - Fix #1187, Increment CreatePipeErrorCounter for all create pipe errors
nasa/cFE#1236 - Fix #1186, Remove useless assignments/checks
nasa/cFE#1237 - Fix #1180, Removes impossible conditions
nasa/cFE#1240 - Fix #1002, Remove deprecated elements
nasa/cFE#1253 - Fix #1252, Squash potentially uninitialized variable warnings
nasa/cFE#1241 - Fix #1185, Squash possible uninitialized variable false alarms
nasa/cFE#1247 - Fix #1246, Typo in CFE_TBL_Validate AppName
nasa/cFE#1234 - Fix #1192, Initialize TotalMsgSize in CFE_SB_GetUserDataLength
nasa/cFE#1245 - Fix #1187, Increment CreatePipeErrorCounter for all create pipe errors
nasa/cFE#1236 - Fix #1186, Remove useless assignments/checks
nasa/cFE#1262 - Fix #1239, scrub include header guards
nasa/cFE#1256 - Fix #1194, check for NULL in SlotUsed helpers
nasa/cFE#1263 - Fix #1261, removed redundant checks for CFE_SUCCESS
nasa/cFE#1250 - Fix #1215, remove task registration calls
nasa/cFE#1242 - Fix #1223, shorten TestRunner function name
nasa/cFE#1242 - Fix #1264, Convert functional test startup script example to use "simple" filenames
nasa/cFE#1229 - Fix #1164, use FS file name parser for commands
nasa/cFE#1257 - Fix #1155, clean up zero copy API
nasa/cFE#1254 - Fix #1181, global variable cleanup
nasa/cFE#1255 - Fix #1206, report PSP version in ES HK TLM
nasa/cFE#1271 - Fix #1270, limit check in pool validation
nasa/cFE#1268 - Fix #1267, add null pointer check
nasa/cFE#1268 - Fix #1269, replace CFE_ES_ERR_BUFFER return for invalid null pointer arguments
nasa/cFE#1260 - Fix #1259, adds --branch-coverage option to genhtml line in lcov Makefile rule

nasa/osal#878 - Fix #843, remove BIG/LITTLE bit order macros
nasa/osal#918 - Fix #846, Minor clean up and clarification in comments/namin
nasa/osal#923 - Fix #831, Finish os-impl-bsd-socket.c coverage testing
nasa/osal#915 - Fix #888, better return codes from OS_SymbolTableDump_Impl
nasa/osal#926 - Fix #853, remove OS_TaskRegister
nasa/osal#935 - Fix #934, Remove unused SCRIPT_MODE flag
nasa/osal#930 - Fix #929, use test function for osal_id_t

nasa/PSP#276 - Fix #275, Adds a UT stub for CFE_PSP_GetKernelTextSegmentInfo
nasa/PSP#278 - Fix #277, add version file

nasa/ci_lab#83 - Fix #82, remove app registration
nasa/ci_lab#84 - Fix #73, use zero copy API

nasa/sample_app#139 - Fix #138, remove app registration
nasa/sample_app#143 - Fix #142, scrub header guards

nasa/sch_lab#75 - Fix #74, remove app registration

nasa/to_lab#96 - Fix #95, remove app registration
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.

Unit test stub needed for CFE_PSP_GetKernelTextSegmentInfo
3 participants