Merge pull request #219 from skliper/ic-20210312

cFS Bundle Integration candidate: 2021-03-12
nasa · Mar 15, 2021 · aaa5c38 · aaa5c38
2 parents c82cdf3 + 055c6e9
commit aaa5c38
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
@@ -39,7 +39,7 @@ jobs:
         if: ${{matrix.cppcheck =='cfe'}}
         run: |
           cd ${{matrix.cppcheck}}
-          cppcheck --force --inline-suppr --std=c99 --language=c --enable=warning,performance,portability,style --suppress=variableScope --inconclusive ./fsw/cfe-core/src ./modules 2> ../${{matrix.cppcheck}}_cppcheck_err.txt
+          cppcheck --force --inline-suppr --std=c99 --language=c --enable=warning,performance,portability,style --suppress=variableScope --inconclusive ./modules/core_api/fsw ./modules/core_private/fsw ./modules/es/fsw ./modules/evs/fsw ./modules/fs/fsw ./modules/msg/fsw ./modules/resourceid/fsw ./modules/sb/fsw ./modules/sbr/fsw ./modules/tbl/fsw ./modules/time/fsw -UCFE_PLATFORM_TIME_CFG_CLIENT -DCFE_PLATFORM_TIME_CFG_SERVER 2> ../${{matrix.cppcheck}}_cppcheck_err.txt
 
       - name: osal strict cppcheck
         if: ${{matrix.cppcheck =='osal'}}

diff --git a/apps/ci_lab b/apps/ci_lab
diff --git a/apps/to_lab b/apps/to_lab
diff --git a/cfe b/cfe
diff --git a/psp b/psp
+15 −15		CMakeLists.txt
+6 −1		README.md
+10 −3		fsw/mcp750-vxworks/CMakeLists.txt
+1 −1		fsw/mcp750-vxworks/inc/psp_version.h
+8 −3		fsw/pc-linux/CMakeLists.txt
+1 −1		fsw/pc-linux/inc/psp_version.h
+12 −3		fsw/pc-rtems/CMakeLists.txt
+1 −1		fsw/pc-rtems/inc/psp_version.h
+9 −2		fsw/shared/CMakeLists.txt
+1 −0		unit-test-coverage/mcp750-vxworks/CMakeLists.txt
+5 −0		unit-test-coverage/mcp750-vxworks/adaptors/CMakeLists.txt
+10 −0		unit-test-coverage/ut-stubs/CMakeLists.txt
+4 −1		ut-stubs/CMakeLists.txt