From 86fb2e9c5b859087886a154ad5a7f93b1291d388 Mon Sep 17 00:00:00 2001 From: anh Date: Mon, 16 Mar 2020 08:07:09 -0400 Subject: [PATCH 1/7] update lgtm file --- .lgtm.yml | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/.lgtm.yml b/.lgtm.yml index fab860eb5..6702cc000 100644 --- a/.lgtm.yml +++ b/.lgtm.yml @@ -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" From 50b52ea5de50909757980937f561f0e7d3103d33 Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Wed, 8 Jan 2020 10:48:44 -0500 Subject: [PATCH 2/7] Fix #39, Improve CI testing --- .travis.yml | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6dc220d6f..822e87bf3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 . @@ -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 From af90257feeb3f8dde8cb60c01e30324c69973db7 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Tue, 24 Mar 2020 10:37:21 -0400 Subject: [PATCH 3/7] Update ci_lab, sample_app, sample_lib, cfe, osal, and cFS-Ground system submodules to integration candidates. --- apps/ci_lab | 2 +- apps/sample_app | 2 +- apps/sample_lib | 2 +- cfe | 2 +- osal | 2 +- tools/cFS-GroundSystem | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/ci_lab b/apps/ci_lab index e9044e452..548297ac8 160000 --- a/apps/ci_lab +++ b/apps/ci_lab @@ -1 +1 @@ -Subproject commit e9044e452049c3ac00c03c5b0f9693fbe371a9ef +Subproject commit 548297ac84cf1072c902fe9e2178e9a47dee9dd1 diff --git a/apps/sample_app b/apps/sample_app index 1f84f205d..a0b5e2920 160000 --- a/apps/sample_app +++ b/apps/sample_app @@ -1 +1 @@ -Subproject commit 1f84f205d1139b71e823092a352892ad8aefe67f +Subproject commit a0b5e2920a04af87f7f59280ae30882e4df4025d diff --git a/apps/sample_lib b/apps/sample_lib index f499730f7..fd777f3ab 160000 --- a/apps/sample_lib +++ b/apps/sample_lib @@ -1 +1 @@ -Subproject commit f499730f7a8dbfdce0e79647b9e0c74644c0d8c0 +Subproject commit fd777f3abe5186bf7242baf9828463622dffab0f diff --git a/cfe b/cfe index 5408523df..f34eb9310 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit 5408523dfef713e9af36ba42fc0a6320a53d920f +Subproject commit f34eb9310667eb70f6ae6037afff56a7deddab5e diff --git a/osal b/osal index 2284a6fc8..2c2ce1e7b 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit 2284a6fc89e7f5dda8e281d8b3b9a540264e2e5f +Subproject commit 2c2ce1e7b1acdd1caba3c9f5fd90fd040453044f diff --git a/tools/cFS-GroundSystem b/tools/cFS-GroundSystem index c98233940..49a9d0f8e 160000 --- a/tools/cFS-GroundSystem +++ b/tools/cFS-GroundSystem @@ -1 +1 @@ -Subproject commit c982339402d4da3ea6f645ffa38280f7bef61d07 +Subproject commit 49a9d0f8e61cc36cefbd050bbc9ee52db9f239dc From 681052489f02579c106a290c293bb4b36ad06105 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Tue, 24 Mar 2020 11:53:10 -0400 Subject: [PATCH 4/7] Update cFE submodule to fix build error. --- cfe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cfe b/cfe index f34eb9310..565dae5b0 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit f34eb9310667eb70f6ae6037afff56a7deddab5e +Subproject commit 565dae5b0f5f8f83c12de27f659fc0db99320d7e From e53cc1d8270dc63b15728916ab80ee0449c11d71 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Wed, 25 Mar 2020 10:01:52 -0400 Subject: [PATCH 5/7] Update sample_app submodule to reflect change in integration-candidate --- apps/sample_app | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/sample_app b/apps/sample_app index a0b5e2920..a34c02e6f 160000 --- a/apps/sample_app +++ b/apps/sample_app @@ -1 +1 @@ -Subproject commit a0b5e2920a04af87f7f59280ae30882e4df4025d +Subproject commit a34c02e6f777191bf0b40482d8ff59a8f65a63e5 From b43283f145b26138effd15756d6410849213e46a Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Fri, 27 Mar 2020 09:21:55 -0400 Subject: [PATCH 6/7] Update sample_app submodule to fix omit-deprecated build error --- apps/sample_app | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/sample_app b/apps/sample_app index a34c02e6f..24a5bdb2b 160000 --- a/apps/sample_app +++ b/apps/sample_app @@ -1 +1 @@ -Subproject commit a34c02e6f777191bf0b40482d8ff59a8f65a63e5 +Subproject commit 24a5bdb2bfef36e64d8a06b5c9e8edadcea0e9bc From 74d4ce206934cf07e15fe791e7caf76f609f6a41 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Fri, 27 Mar 2020 09:59:02 -0400 Subject: [PATCH 7/7] Update cfe, osal, sample_app, sample_lib, cFS-GroundSystem, and ci_lab submodules to master --- apps/ci_lab | 2 +- apps/sample_app | 2 +- apps/sample_lib | 2 +- cfe | 2 +- osal | 2 +- tools/cFS-GroundSystem | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/ci_lab b/apps/ci_lab index 548297ac8..fe9e3ef36 160000 --- a/apps/ci_lab +++ b/apps/ci_lab @@ -1 +1 @@ -Subproject commit 548297ac84cf1072c902fe9e2178e9a47dee9dd1 +Subproject commit fe9e3ef369fa35fd00c2ae109693282167d0747c diff --git a/apps/sample_app b/apps/sample_app index 24a5bdb2b..602aabeb2 160000 --- a/apps/sample_app +++ b/apps/sample_app @@ -1 +1 @@ -Subproject commit 24a5bdb2bfef36e64d8a06b5c9e8edadcea0e9bc +Subproject commit 602aabeb299edc56d626c4774971e2cab16d378e diff --git a/apps/sample_lib b/apps/sample_lib index fd777f3ab..33efec32e 160000 --- a/apps/sample_lib +++ b/apps/sample_lib @@ -1 +1 @@ -Subproject commit fd777f3abe5186bf7242baf9828463622dffab0f +Subproject commit 33efec32e23fdee3e4a373de7e61bc812173e411 diff --git a/cfe b/cfe index 565dae5b0..62252d114 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit 565dae5b0f5f8f83c12de27f659fc0db99320d7e +Subproject commit 62252d11409f337d3dea2732739e068987363985 diff --git a/osal b/osal index 2c2ce1e7b..20a83c446 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit 2c2ce1e7b1acdd1caba3c9f5fd90fd040453044f +Subproject commit 20a83c4460b5cd820a9b253003ef91ec3729b8a5 diff --git a/tools/cFS-GroundSystem b/tools/cFS-GroundSystem index 49a9d0f8e..bfe112a4a 160000 --- a/tools/cFS-GroundSystem +++ b/tools/cFS-GroundSystem @@ -1 +1 @@ -Subproject commit 49a9d0f8e61cc36cefbd050bbc9ee52db9f239dc +Subproject commit bfe112a4a5c1f11ef169da6b9035bfb96cb4e86e