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

Integration Candidate: 2020-05-27 #487

Merged
merged 13 commits into from
Jun 10, 2020
Merged

Integration Candidate: 2020-05-27 #487

merged 13 commits into from
Jun 10, 2020

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Jun 3, 2020

Describe the contribution
Fix #380
Fix #381
Fix #449
Fix #479

Testing performed
https://github.com/nasa/cFS/pull/96/checks

Expected behavior changes

PR #467 - Rename BSPs that can be used on multiple platforms.
mcp750-vxworks becomes generic-vxworks
pc-linux becomes generic-linux

PR #480 - New features only, does not change existing behavior.
UT Hook functions now have the capability to get argument values by name, which is more future proof than assuming a numeric index.

PR #452 - Add functional test for OS_TimerAdd

PR #481 - Added functional tests for OS_TimeBase Api on OS_TimeBaseCreate, OS_TimeBaseSet, OS_TimeBaseDelete, OS_TimeBaseGetIdByName, OS_TimeBaseGetInfo, OS_TimeBaseGetFreeRun

System(s) tested on
Ubuntu:Bionic

Additional context
Part of nasa/cFS#96

Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.
Yasir Khan, NASA-GSFC

jphickey and others added 9 commits May 20, 2020 22:21
Add the capability to store parameter names in addtion
to pointers as part of the stub argument context data.

Macroize the UT_Stub_RegisterContext function utstubs.h to
also pass the parameter name in addition to the pointer.

Also add hook-side accessor functions/macros to make it
easier and more reliable to get this information from
the context data.
These adaptor layers can be used on a variety of boards.
Renaming the directory reflects that.

Note - not renaming pc-rtems at this time, as that still
has some non-generic aspects to it.
Fix #479, add name association to stub arguments
…nctional-test

Fix #381, Add OS_TimerAdd functional test
…ional-Tests

Fix #380, Add OS_TimeBase Api Functional Tests
@astrogeco
Copy link
Contributor Author

@yammajamma and @jphickey got a unit test failure on nasa/cFS#96

idmap-api-test

@jphickey
Copy link
Contributor

jphickey commented Jun 9, 2020

This is a race condition in idmap-api-test .... looks like it was already there from the previous cycle.

@jphickey
Copy link
Contributor

jphickey commented Jun 9, 2020

FYI -submitted #493.

This is not a newly-added in the current IC - it exists in master branch, it was just not caught.

@astrogeco
Copy link
Contributor Author

FYI -submitted #493.

This is not a newly-added in the current IC - it exists in master branch, it was just not caught.

weird, I guess it's an intermittent issue? The bundle build passed a couple of commits ago.

@jphickey
Copy link
Contributor

jphickey commented Jun 9, 2020

weird, I guess it's an intermittent issue? The bundle build passed a couple of commits ago.

Yes, its a race condition so it depends on the configuration/scheduler/load of the host system running the test.

@yammajamma
Copy link
Contributor

I saw this happening on the master branch on Friday intermittently, it was not doing this before then at at all. I tried to replicate it, but couldn't get it to do so, and tried to get others I know to run it and replicate it as well, and it didn't happen with them either, so I wasn't sure what the issue was. Figured I'd try and see if it happens again today, which I can see that it is. Are there changes that I can make to my file to alleviate the issue?

Use a proper "setup" function to create the resources for the test.
Add a delay loop to ensure that the child task has executed before
continuing with the rest of the test.
@jphickey
Copy link
Contributor

jphickey commented Jun 9, 2020

See PR #495 which should fix this.

@astrogeco astrogeco marked this pull request as ready for review June 10, 2020 23:24
@astrogeco astrogeco merged commit 07fd022 into master Jun 10, 2020
@skliper skliper added this to the 5.1.0 milestone Aug 21, 2020
jphickey pushed a commit to jphickey/osal that referenced this pull request Aug 10, 2022
now int to avoid possible string buffer overflow
jphickey pushed a commit to jphickey/osal that referenced this pull request Aug 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants