Merge pull request #127 from nasa/integration-candidate · nasa/cFS@0cbbcab

Commit

Merge pull request #127 from nasa/integration-candidate

Integration Candidate: 2020-08-12
See 
nasa/cFE#816
nasa/osal#563

astrogeco authored Aug 19, 2020

2 parents 388b557 + 2088df9 commit 0cbbcab

cfe

Submodule cfe updated 25 files

+9 −2		README.md
+7 −0		cmake/mission_defaults.cmake
+1 −1		cmake/sample_defs/global_build_options.cmake
+40 −0		docs/README_functionaltest.md
+0 −10		docs/cFE Application Developers Guide.md
+7 −61		docs/cFE_FunctionalRequirements.csv
+12 −2		fsw/cfe-core/src/inc/cfe_sb.h
+7 −0		fsw/cfe-core/src/inc/cfe_sb_events.h
+12 −12		fsw/cfe-core/src/inc/cfe_version.h
+6 −0		fsw/cfe-core/src/sb/cfe_sb_api.c
+2 −0		fsw/cfe-core/src/sb/cfe_sb_priv.h
+0 −116		fsw/cfe-core/unit-test/sb_UT.c
+1 −108		fsw/cfe-core/unit-test/sb_UT.h
+4 −0		fsw/cfe-core/ut-stubs/ut_sb_stubs.c
+12 −0		modules/cfe_assert/CMakeLists.txt
+63 −0		modules/cfe_assert/inc/cfe_assert.h
+56 −0		modules/cfe_assert/src/cfe_assert_init.c
+137 −0		modules/cfe_assert/src/cfe_assert_io.c
+8 −0		modules/cfe_testcase/CMakeLists.txt
+43 −0		modules/cfe_testcase/src/cfe_test.c
+44 −0		modules/cfe_testcase/src/cfe_test.h
+44 −0		modules/cfe_testcase/src/es_test.c
+10 −0		modules/cfe_testrunner/CMakeLists.txt
+63 −0		modules/cfe_testrunner/inc/cfe_testrunner.h
+120 −0		modules/cfe_testrunner/src/cfe_testrunner_main.c

osal

Submodule osal updated 10 files

+12 −5		README.md
+10 −10		src/os/inc/osapi-version.h
+108 −0		src/tests/file-sys-add-fixed-map-api-test/file-sys-add-fixed-map-api-test.c
+624 −0		src/tests/network-api-test/network-api-test.c
+18 −34		ut_assert/inc/utlist.h
+23 −0		ut_assert/inc/uttest.h
+1 −1		ut_assert/src/utbsp.c
+1 −1		ut_assert/src/utglobal.h
+114 −87		ut_assert/src/utlist.c
+59 −13		ut_assert/src/uttest.c

Please sign in to comment.