Skip to content

Commit

Permalink
Merge pull request #66 from nasa/integration-candidate
Browse files Browse the repository at this point in the history 
Integration Candidate: 2020-04-08
  • Loading branch information
@astrogeco
astrogeco authored Apr 20, 2020
2 parents 788b8d6 + 5c49320 commit ffb8abf
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion cfe
Submodule cfe updated 11 files
+4 −1 README.md
+14 −0 cmake/arch_build.cmake
+43 −21 cmake/sample_defs/toolchain-i686-rtems4.11.cmake
+23 −0 fsw/cfe-core/src/inc/cfe_sb.h
+1 −1 fsw/cfe-core/src/inc/cfe_version.h
+1 −1 fsw/cfe-core/src/sb/cfe_sb_api.c
+37 −1 fsw/cfe-core/src/sb/cfe_sb_msg_id_util.c
+0 −30 fsw/cfe-core/src/sb/cfe_sb_priv.c
+0 −4 fsw/cfe-core/src/sb/cfe_sb_priv.h
+6 −9 fsw/cfe-core/unit-test/CMakeLists.txt
+9 −0 fsw/cfe-core/ut-stubs/ut_sb_stubs.c
2 changes: 1 addition & 1 deletion osal
Submodule osal updated 71 files
+258 −245 CMakeLists.txt
+5 −1 README.md
+26 −0 src/bsp/mcp750-vxworks/CMakeLists.txt
+8 −0 src/bsp/mcp750-vxworks/build_options.cmake
+0 −97 src/bsp/mcp750-vxworks/make/compiler-opts.mak
+0 −35 src/bsp/mcp750-vxworks/make/link-rules.mak
+52 −0 src/bsp/mcp750-vxworks/src/bsp_console.c
+30 −41 src/bsp/mcp750-vxworks/src/bsp_start.c
+27 −0 src/bsp/mcp750-vxworks/src/mcp750_bsp_internal.h
+0 −222 src/bsp/mcp750-vxworks/ut-src/bsp_ut.c
+0 −67 src/bsp/mcp750-vxworks/ut-src/bsp_ut_voltab.c
+29 −0 src/bsp/pc-linux/CMakeLists.txt
+28 −0 src/bsp/pc-linux/build_options.cmake
+0 −14 src/bsp/pc-linux/make/build_options.cmake
+114 −0 src/bsp/pc-linux/src/bsp_console.c
+168 −41 src/bsp/pc-linux/src/bsp_start.c
+1 −4 src/bsp/pc-linux/src/bsp_voltab.c
+37 −0 src/bsp/pc-linux/src/pclinux_bsp_internal.h
+0 −362 src/bsp/pc-linux/ut-src/bsp_ut.c
+0 −65 src/bsp/pc-linux/ut-src/bsp_ut_voltab.c
+11 −0 src/bsp/pc-rtems/CMakeLists.txt
+15 −0 src/bsp/pc-rtems/build_options.cmake
+0 −3 src/bsp/pc-rtems/make/build_options.cmake
+49 −0 src/bsp/pc-rtems/src/bsp_console.c
+327 −151 src/bsp/pc-rtems/src/bsp_start.c
+59 −0 src/bsp/pc-rtems/src/pcrtems_bsp_internal.h
+0 −530 src/bsp/pc-rtems/ut-src/bsp_ut.c
+0 −61 src/bsp/pc-rtems/ut-src/bsp_ut_voltab.c
+139 −0 src/bsp/shared/bsp-impl.h
+32 −0 src/bsp/shared/bsp_default_app_run.c
+41 −0 src/bsp/shared/bsp_default_app_startup.c
+31 −0 src/bsp/shared/bsp_default_symtab.c
+74 −0 src/bsp/shared/osapi-bsp.c
+55 −0 src/os/inc/osapi-os-core.h
+1 −1 src/os/inc/osapi-version.h
+19 −0 src/os/posix/CMakeLists.txt
+6 −27 src/os/posix/build_options.cmake
+62 −83 src/os/posix/osapi.c
+17 −0 src/os/rtems/CMakeLists.txt
+8 −9 src/os/rtems/build_options.cmake
+17 −0 src/os/vxworks/CMakeLists.txt
+9 −2 src/os/vxworks/build_options.cmake
+31 −96 src/unit-test-coverage/CMakeLists.txt
+13 −7 src/unit-test-coverage/posix/modules/CMakeLists.txt
+0 −1 src/unit-test-coverage/posix/ut-stubs/src/osapi-impl-posix-stubs.c
+7 −3 src/unit-test-coverage/shared/modules/CMakeLists.txt
+9 −13 src/unit-test-coverage/shared/src/coveragetest-filesys.c
+10 −3 src/unit-test-coverage/ut-stubs/CMakeLists.txt
+0 −3 src/unit-test-coverage/vxworks/CMakeLists.txt
+7 −3 src/unit-test-coverage/vxworks/modules/CMakeLists.txt
+3 −13 src/unit-tests/CMakeLists.txt
+80 −0 src/unit-tests/README.md
+29 −0 src/unit-tests/inc/ut_os_support.h
+59 −513 src/unit-tests/oscore-test/ut_oscore_binsem_test.c
+0 −78 src/unit-tests/oscore-test/ut_oscore_countsem_test.c
+0 −78 src/unit-tests/oscore-test/ut_oscore_exception_test.c
+0 −78 src/unit-tests/oscore-test/ut_oscore_misc_test.c
+0 −78 src/unit-tests/oscore-test/ut_oscore_mutex_test.c
+0 −78 src/unit-tests/oscore-test/ut_oscore_queue_test.c
+0 −78 src/unit-tests/oscore-test/ut_oscore_task_test.c
+0 −78 src/unit-tests/osfile-test/ut_osfile_dirio_test.c
+0 −80 src/unit-tests/osfile-test/ut_osfile_fileio_test.c
+0 −78 src/unit-tests/osfilesys-test/ut_osfilesys_diskio_test.c
+0 −80 src/unit-tests/osloader-test/ut_osloader_module_test.c
+0 −80 src/unit-tests/osloader-test/ut_osloader_symtable_test.c
+0 −80 src/unit-tests/osnetwork-test/ut_osnetwork_misc_test.c
+0 −78 src/unit-tests/ostimer-test/ut_ostimer_timerio_test.c
+53 −0 src/ut-stubs/CMakeLists.txt
+45 −0 ut_assert/CMakeLists.txt
+2 −18 ut_assert/inc/utbsp.h
+248 −0 ut_assert/src/utbsp.c
2 changes: 1 addition & 1 deletion psp
Submodule psp updated 15 files
+15 −12 CMakeLists.txt
+4 −0 README.md
+33 −23 cmake/Modules/Platform/RTEMS.cmake
+13 −0 fsw/mcp750-vxworks/CMakeLists.txt
+1 −1 fsw/mcp750-vxworks/inc/psp_version.h
+11 −6 fsw/mcp750-vxworks/make/build_options.cmake
+21 −4 fsw/mcp750-vxworks/src/cfe_psp_start.c
+13 −0 fsw/pc-linux/CMakeLists.txt
+1 −1 fsw/pc-linux/inc/psp_version.h
+10 −0 fsw/pc-linux/make/build_options.cmake
+9 −4 fsw/pc-linux/src/cfe_psp_start.c
+13 −0 fsw/pc-rtems/CMakeLists.txt
+1 −1 fsw/pc-rtems/inc/psp_version.h
+14 −0 fsw/pc-rtems/make/build_options.cmake
+2 −217 fsw/pc-rtems/src/cfe_psp_start.c

0 comments on commit ffb8abf

Please sign in to comment.