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 20200108 #350

Merged
merged 4 commits into from
Jan 17, 2020
Merged

Integration Candidate 20200108 #350

merged 4 commits into from
Jan 17, 2020

Conversation

skliper
Copy link
Contributor

@skliper skliper commented Jan 14, 2020

Describe the contribution
Merge #325, #336
Fix #294, fix #335

Testing performed

  1. Checked out IC bundle
  2. Built and ran cFS unit tests and OSAL coverage (vxworks and shared)
    1. All passed
  3. make osalguide to confirm it built
  4. Ran core-cpu1 (cFS), no errors/warnings/failures observed

Expected behavior changes
OS timer test should now always pass

System(s) tested on

  • cFS Dev Server 2
  • OS: Ubuntu 18.04
  • Versions: IC branches

Additional context
N/A

Third party code
N/A

Contributor Info - All information REQUIRED for consideration of pull request
Jacob Hageman - NASA/GSFC

Implements a more layered architecture for test code.
Rather than having each test provide OS_Application_Startup() directly,
now the UT assert library provides OS_Application_Startup() in common code.
This also introduces a new function OS_Application_Run() to implement the
test routine.  This replaces UtTest_Run.

The actual test setup is now done by a function called UtTest_Setup().

This allows for better layering where UT-Assert provides the
notion of an "OSAL application".  This is a step toward simplifying
the BSP architecture, eventually combining the normal application
and unit test BSP code into a single BSP.
On POSIX, call sigtimedwait() on the selected RT signal as part of
the set up for the timebase.  This ensures that if the signal is
already pending, it will be cleared.

This also simplifies the timer callback routine in the UT code,
cleaning up some unncessary extra logic.
@skliper skliper added this to the 5.1.0 milestone Jan 14, 2020
Fix #294: Use alternate setup function for Tests
Fix #335: Clear pending signal when configuring timer
@skliper skliper merged commit 702bf5e into master Jan 17, 2020
@skliper skliper added the CCB:Approved Indicates code review and approval by community CCB label Jan 17, 2020
@skliper
Copy link
Contributor Author

skliper commented Jan 17, 2020

CCB 20200115 - Reviewed and approved for merge to master

@skliper skliper deleted the ic-20200108 branch January 17, 2020 21:01
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.

osal_timer_UT periodic failure Alternative entry point for UT-Assert based test applications
2 participants