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-04-15 #417

Merged
merged 12 commits into from
Apr 20, 2020
Merged

Integration Candidate: 2020-04-15 #417

merged 12 commits into from
Apr 20, 2020

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Apr 15, 2020

Describe the contribution
Fixes #232, #397, #312, #261, #362, and #363

See Bundle IC at nasa/cFS#66

Testing performed
See PRs
Bundle CI - https://travis-ci.com/github/nasa/cFS/builds/160607248

Expected behavior changes

System(s) tested on
See PRs
Bundle CI - Ubuntu:Bionic

Contributor Info - All information REQUIRED for consideration of pull request
Christopher D. Knight, NASA-ARC
Joseph Hickey, Vantage Systems, Inc.
David Archuleta Jr., Self
Gerardo E. Cruz-Ortiz - NASA-GSFC

davearch and others added 10 commits March 31, 2020 17:11
Do not clobber the CMAKE_C_FLAGS value as part of the OSAL build.
Instead, use target_compile_options and target_include_directories
as needed to set the compile options for specific targets.

This also creates a separate CMakeLists.txt file for each OS/BSP
implementation library rather than using aux_source_directory.
Each implementation-specific build can then set any additional
options as required for that platform.

Note that any entity needing to compile/link with OSAL should
now obtain the requisite compile flags and directories by querying
the INTERFACE_COMPILE_DEFINITIONS and INTERFACE_INCLUDE_DIRECTORIES
properties on the osal library target.
Refactor the OSAL BSP code so that a single BSP implementation
can work for both normal applications as well as unit tests.

This intoduces a new bsp implementation abstraction layer akin
to the low level OS implementation layer.  This handles dealing
with bootloader/command line arguments, and debug console
manipluation.
Build the full suite of OSAL coverage tests as part of
the normal build when ENABLE_UNIT_TESTS is true.

This will use the same target OSAL BSP to execute the tests
as is used for the FSW.
This ensures that the return value of the write() call is checked,
and avoids a potential compiler warning.  There is still no recourse if
the write call fails, but it can retry if it was short.
Fix #397, Remove old unit test example, add README.md, further macro cleanup
@astrogeco astrogeco linked an issue Apr 15, 2020 that may be closed by this pull request
jphickey and others added 2 commits April 15, 2020 10:09
Avoids calling write() if length is zero.
Fix #261, #312, and #362, OSAL build cleanup (multiple issues)
@astrogeco astrogeco changed the title WIP: Integration Candidate: 2020-04-15 Integration Candidate: 2020-04-15 Apr 20, 2020
@astrogeco astrogeco merged commit 4904591 into master Apr 20, 2020
@skliper skliper added this to the 5.1.0 milestone Jun 1, 2020
jphickey pushed a commit to jphickey/osal that referenced this pull request Aug 10, 2022
Removed conflicting files, not needed after nasa#417 changes.
jphickey pushed a commit to jphickey/osal that referenced this pull request Aug 10, 2022
Fix nasa#415, nasa#429
Reviewed and approved at 2019-12-18 CCB
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.

simplify unit tests with utassert.h macros PTHREAD_STACK_MIN typo in POSIX/POSIX-NG OSAL
5 participants