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-03-18 #58

Merged
merged 9 commits into from
Mar 27, 2020
31 changes: 16 additions & 15 deletions .lgtm.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
path_classifiers:

queries:
- include: "*"
- exclude: cpp/class-many-fields
- exclude: cpp/long-switch
- exclude: cpp/trivial-switch
- include: "*"
- exclude: "cpp/class-many-fields"
- exclude: "cpp/long-switch"
- exclude: "cpp/trivial-switch"

extraction:
python:
python_setup:
version: "3"
index:
include: "tools/cFS-GroundSystem"
cpp:
index:
build_command:
- cp cfe/cmake/Makefile.sample Makefile
- cp -r cfe/cmake/sample_defs sample_defs
- make prep
- make


index:
build_command:
- "cp cfe/cmake/Makefile.sample Makefile"
- "cp -r cfe/cmake/sample_defs sample_defs"
- "make prep"
- "make"

56 changes: 54 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,26 @@ addons:
- ubuntu-toolchain-r-test
packages:
- cmake
env:
global:
- SIMULATION=native
- ENABLE_UNIT_TESTS=true
matrix:
- BUILDTYPE=release OMIT_DEPRECATED=true
- BUILDTYPE=release OMIT_DEPRECATED=false
- BUILDTYPE=debug OMIT_DEPRECATED=true
- BUILDTYPE=debug OMIT_DEPRECATED=false

before_install:
- sudo apt-get install cppcheck
- sudo apt-get install cppcheck doxygen lcov graphviz

script:
# Check versions
- cppcheck --version
# Setup standard build
# Setup standard permissive build
- cp cfe/cmake/Makefile.sample Makefile
- cp -r cfe/cmake/sample_defs sample_defs
- sed -i 's/undef OSAL_DEBUG_PERMISSIVE_MODE/define OSAL_DEBUG_PERMISSIVE_MODE/g' sample_defs/default_osconfig.h
# Static code analysis
# Below is intent but fails - exit code bug in cppcheck 1.82
# - cppcheck --force --inline-suppr --quiet --error-exitcode=1 .
Expand All @@ -36,5 +46,47 @@ script:
- make prep
- make
- make install
# Run unit tests and generate coverage results
- make test
- make lcov
# Eventually check/enforce minimum coverage
# Make documentation
- make doc > make_doc_stdout.txt 2> make_doc_stderr.txt
- |
if [[ -s make_doc_stderr.txt ]]; then
echo "You must fix doxygen errors for \"doc\" before submitting a pull request"
echo ""
cat make_doc_stderr.txt
exit -1
fi
- make usersguide > make_usersguide_stdout.txt 2> make_usersguide_stderr.txt
- |
if [[ -s make_usersguide_stderr.txt ]]; then
echo "You must fix doxygen errors for \"usersguide\" before submitting a pull request"
echo ""
cat make_usersguide_stderr.txt
exit -1
fi
- make osalguide > make_osalguide_stdout.txt 2> make_osalguide_stderr.txt
- |
if [[ -s make_osalguide_stderr.txt ]]; then
echo "You must fix doxygen errors for \"osalguide\" before submitting a pull request"
echo ""
cat make_osalguide_stderr.txt
exit -1
fi
# Eventually enforce no doxygen warnings
# List cpu1 for core binary
- ls build/exe/cpu1/
# Start cFE (pipe output to file), pause, send reset command, check outputs
- cd build/exe/cpu1
- ./core-cpu1 > cFS_startup.txt &
- sleep 30
- ../host/cmdUtil --endian=LE --pktid=0x1806 --cmdcode=2 --half=0x0002
- |
if [[ -n $(grep -i "warn\|err\|fail" cFS_startup.txt) ]]; then
echo "Must resolve warn|err|fail in cFS startup before submitting a pull request"
echo ""
grep -i 'warn\|err\|fail' cFS_startup.txt
exit -1
fi
2 changes: 1 addition & 1 deletion apps/ci_lab
2 changes: 1 addition & 1 deletion cfe
Submodule cfe updated 55 files
+5 −0 README.md
+19 −21 cmake/Makefile.sample
+3 −10 cmake/cfe-common.doxyfile.in
+3 −5 cmake/cfe-usersguide.doxyfile.in
+1 −1 cmake/osal-common.doxyfile.in
+5 −9 cmake/osalguide.doxyfile.in
+3 −3 cmake/sample_defs/cpu1_platform_cfg.h
+0 −20 docs/README_dox_templates.txt
+0 −95 docs/dox_templates.xml
+52 −177 docs/src/cfe_es.dox
+32 −12 docs/src/cfe_evs.dox
+21 −36 docs/src/cfe_sb.dox
+23 −26 docs/src/cfe_tbl.dox
+8 −6 docs/src/cfe_time.dox
+0 −67 docs/src/cfe_usersguide.dox
+0 −5 docs/src/ddd_main.dox
+246 −305 docs/src/main.dox
+3 −5 docs/src/mnem_maps/cfe_es_cmd_mnem_map
+2 −4 docs/src/mnem_maps/cfe_es_tlm_mnem_map
+8 −10 docs/src/mnem_maps/cfe_evs_cmd_mnem_map
+2 −4 docs/src/mnem_maps/cfe_evs_tlm_mnem_map
+2 −4 docs/src/mnem_maps/cfe_sb_cmd_mnem_map
+4 −5 docs/src/mnem_maps/cfe_sb_tlm_mnem_map
+2 −4 docs/src/mnem_maps/cfe_tbl_cmd_mnem_map
+4 −6 docs/src/mnem_maps/cfe_tbl_tlm_mnem_map
+2 −4 docs/src/mnem_maps/cfe_time_cmd_mnem_map
+18 −20 docs/src/mnem_maps/cfe_time_tlm_mnem_map
+84 −40 docs/src/osal_fs.dox
+6 −5 docs/src/osal_timer.dox
+0 −30 docs/src/osalguide.dox
+73 −25 docs/src/osalmain.dox
+24 −115 fsw/cfe-core/src/es/cfe_es_api.c
+1 −3 fsw/cfe-core/src/es/cfe_es_start.c
+7 −61 fsw/cfe-core/src/evs/cfe_evs.c
+21 −46 fsw/cfe-core/src/fs/cfe_fs_api.c
+2 −3 fsw/cfe-core/src/fs/cfe_fs_decompress.c
+922 −786 fsw/cfe-core/src/inc/cfe_error.h
+260 −279 fsw/cfe-core/src/inc/cfe_es.h
+3 −6 fsw/cfe-core/src/inc/cfe_es_events.h
+1 −1 fsw/cfe-core/src/inc/cfe_es_extern_typedefs.h
+58 −54 fsw/cfe-core/src/inc/cfe_evs.h
+2 −2 fsw/cfe-core/src/inc/cfe_evs_events.h
+48 −57 fsw/cfe-core/src/inc/cfe_fs.h
+418 −423 fsw/cfe-core/src/inc/cfe_sb.h
+5 −7 fsw/cfe-core/src/inc/cfe_sb_events.h
+297 −281 fsw/cfe-core/src/inc/cfe_tbl.h
+188 −237 fsw/cfe-core/src/inc/cfe_time.h
+3 −5 fsw/cfe-core/src/inc/cfe_time_msg.h
+55 −34 fsw/cfe-core/src/inc/cfe_version.h
+58 −415 fsw/cfe-core/src/sb/cfe_sb_api.c
+6 −30 fsw/cfe-core/src/sb/cfe_sb_msg_id_util.c
+48 −219 fsw/cfe-core/src/sb/cfe_sb_util.c
+45 −116 fsw/cfe-core/src/tbl/cfe_tbl_api.c
+75 −189 fsw/cfe-core/src/time/cfe_time_api.c
+3 −6 fsw/cfe-core/src/time/cfe_time_tone.c