Skip to content

Commit

Permalink
Merge pull request nasa#256 from nasa/integration-candidate
Browse files Browse the repository at this point in the history 
cFS Bundle Integration candidate: 2021-05-11
  • Loading branch information
@astrogeco
astrogeco committed May 12, 2021
2 parents a07f7a3 + 43cbd3f commit 57729ba
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cfe
Submodule cfe updated 53 files
+1 −1 .github/workflows/static-analysis.yml
+0 −29 .travis.yml
+13 −0 README.md
+5 −5 cmake/arch_build.cmake
+48 −0 cmake/generate_table.cmake
+20 −195 cmake/sample_defs/default_osconfig.cmake
+55 −2 cmake/sample_defs/native_osconfig.cmake
+1 −19 modules/core_api/fsw/inc/cfe_fs.h
+1 −1 modules/core_api/fsw/inc/cfe_version.h
+16 −8 modules/core_api/ut-stubs/CMakeLists.txt
+596 −0 modules/core_api/ut-stubs/src/cfe_es_handlers.c
+957 −0 modules/core_api/ut-stubs/src/cfe_es_stubs.c
+112 −0 modules/core_api/ut-stubs/src/cfe_evs_handlers.c
+164 −0 modules/core_api/ut-stubs/src/cfe_evs_stubs.c
+315 −0 modules/core_api/ut-stubs/src/cfe_fs_handlers.c
+228 −0 modules/core_api/ut-stubs/src/cfe_fs_stubs.c
+362 −0 modules/core_api/ut-stubs/src/cfe_msg_handlers.c
+624 −0 modules/core_api/ut-stubs/src/cfe_msg_stubs.c
+147 −0 modules/core_api/ut-stubs/src/cfe_resourceid_handlers.c
+102 −0 modules/core_api/ut-stubs/src/cfe_resourceid_stubs.c
+438 −0 modules/core_api/ut-stubs/src/cfe_sb_handlers.c
+450 −0 modules/core_api/ut-stubs/src/cfe_sb_stubs.c
+87 −0 modules/core_api/ut-stubs/src/cfe_tbl_handlers.c
+302 −0 modules/core_api/ut-stubs/src/cfe_tbl_stubs.c
+223 −0 modules/core_api/ut-stubs/src/cfe_time_handlers.c
+381 −0 modules/core_api/ut-stubs/src/cfe_time_stubs.c
+0 −1,296 modules/core_api/ut-stubs/src/ut_es_stubs.c
+0 −313 modules/core_api/ut-stubs/src/ut_evs_stubs.c
+0 −453 modules/core_api/ut-stubs/src/ut_fs_stubs.c
+0 −705 modules/core_api/ut-stubs/src/ut_msg_stubs.c
+0 −120 modules/core_api/ut-stubs/src/ut_resourceid_stubs.c
+0 −774 modules/core_api/ut-stubs/src/ut_sb_stubs.c
+0 −311 modules/core_api/ut-stubs/src/ut_tbl_stubs.c
+229 −0 modules/core_api/ut-stubs/src/ut_time_handlers.c
+0 −419 modules/core_api/ut-stubs/src/ut_time_stubs.c
+0 −0 modules/core_private/fsw/inc/cfe_es_core_internal.h
+0 −0 modules/core_private/fsw/inc/cfe_evs_core_internal.h
+19 −0 modules/core_private/fsw/inc/cfe_fs_core_internal.h
+0 −0 modules/core_private/fsw/inc/cfe_sb_core_internal.h
+1 −0 modules/core_private/fsw/inc/cfe_sbr.h
+0 −0 modules/core_private/fsw/inc/cfe_tbl_core_internal.h
+0 −0 modules/core_private/fsw/inc/cfe_time_core_internal.h
+8 −0 modules/core_private/ut-stubs/CMakeLists.txt
+75 −0 modules/core_private/ut-stubs/src/cfe_es_core_internal_handlers.c
+91 −0 modules/core_private/ut-stubs/src/cfe_es_core_internal_stubs.c
+69 −0 modules/core_private/ut-stubs/src/cfe_evs_core_internal_stubs.c
+61 −0 modules/core_private/ut-stubs/src/cfe_fs_core_internal_handlers.c
+61 −0 modules/core_private/ut-stubs/src/cfe_fs_core_internal_stubs.c
+69 −0 modules/core_private/ut-stubs/src/cfe_sb_core_internal_stubs.c
+69 −0 modules/core_private/ut-stubs/src/cfe_tbl_core_internal_stubs.c
+69 −0 modules/core_private/ut-stubs/src/cfe_time_core_internal_stubs.c
+1 −10 modules/core_private/ut-stubs/src/ut_support.c
+1 −0 modules/es/fsw/src/cfe_es_backgroundtask.c
2 changes: 1 addition & 1 deletion osal
Submodule osal updated 52 files
+1 −1 .github/workflows/static-analysis.yml
+10 −0 README.md
+381 −468 doc/OSAL-Configuration-Guide.md
+52 −3 src/bsp/generic-linux/src/bsp_start.c
+4 −1 src/bsp/generic-linux/src/generic_linux_bsp_internal.h
+47 −0 src/bsp/generic-vxworks/src/bsp_start.c
+17 −0 src/bsp/generic-vxworks/src/generic_vxworks_bsp_internal.h
+39 −0 src/bsp/pc-rtems/src/bsp_start.c
+5 −2 src/bsp/pc-rtems/src/pcrtems_bsp_internal.h
+22 −0 src/bsp/shared/inc/bsp-impl.h
+2 −0 src/os/inc/osapi-clock.h
+1 −2 src/os/inc/osapi-common.h
+2 −0 src/os/inc/osapi-dir.h
+3 −0 src/os/inc/osapi-error.h
+8 −0 src/os/inc/osapi-file.h
+17 −0 src/os/inc/osapi-filesys.h
+1 −0 src/os/inc/osapi-heap.h
+2 −0 src/os/inc/osapi-idmap.h
+2 −0 src/os/inc/osapi-module.h
+2 −0 src/os/inc/osapi-network.h
+1 −0 src/os/inc/osapi-queue.h
+4 −0 src/os/inc/osapi-select.h
+1 −0 src/os/inc/osapi-shell.h
+14 −0 src/os/inc/osapi-sockets.h
+13 −1 src/os/inc/osapi-task.h
+9 −0 src/os/inc/osapi-timebase.h
+5 −0 src/os/inc/osapi-timer.h
+1 −1 src/os/inc/osapi-version.h
+12 −8 src/os/portable/os-impl-bsd-sockets.c
+5 −0 src/os/portable/os-impl-console-bsp.c
+5 −0 src/os/posix/inc/os-impl-sockets.h
+5 −0 src/os/rtems/inc/os-impl-sockets.h
+17 −2 src/os/shared/src/osapi-debug.c
+3 −3 src/os/shared/src/osapi-queue.c
+12 −0 src/os/vxworks/inc/os-impl-sockets.h
+45 −27 src/tests/network-api-test/network-api-test.c
+0 −8 src/unit-test-coverage/portable/src/coveragetest-bsd-sockets.c
+2 −7 src/unit-test-coverage/shared/src/coveragetest-errors.c
+4 −6 src/unit-test-coverage/shared/src/coveragetest-file.c
+8 −0 src/unit-test-coverage/shared/src/coveragetest-filesys.c
+27 −4 src/unit-test-coverage/shared/src/coveragetest-idmap.c
+2 −7 src/unit-test-coverage/shared/src/coveragetest-network.c
+2 −0 src/unit-test-coverage/shared/src/coveragetest-select.c
+3 −0 src/unit-test-coverage/shared/src/coveragetest-sockets.c
+3 −10 src/unit-test-coverage/shared/src/coveragetest-time.c
+5 −3 src/unit-test-coverage/shared/src/coveragetest-timebase.c
+6 −0 src/unit-test-coverage/ut-stubs/inc/OCS_bsp-impl.h
+2 −0 src/unit-test-coverage/ut-stubs/override_inc/bsp-impl.h
+16 −0 src/unit-test-coverage/ut-stubs/src/bsp-console-impl-stubs.c
+140 −33 ut_assert/inc/utassert.h
+88 −14 ut_assert/inc/uttools.h
+7 −0 ut_assert/src/utbsp.c

0 comments on commit 57729ba

Please sign in to comment.