Skip to content

Commit

Permalink
Add cli and test to includes in sonar, fix issues
Browse files Browse the repository at this point in the history
Signed-off-by: Bogdan Vaneev <[email protected]>
  • Loading branch information
Warchant authored and lebdron committed Dec 19, 2017
1 parent 44d3868 commit 4d6c823
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
7 changes: 3 additions & 4 deletions .codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ coverage:
patch: # measures only changes made in PR/commit
default:
# basic
target: 50..100
target: auto
base: auto
# advanced
branches: null
Expand All @@ -22,9 +22,9 @@ coverage:
target: auto
threshold: 0%
base: auto
tests:
test:
target: auto
paths: "tests/" # only include coverage in "tests/" folder
paths: "test/" # only include coverage in "test/" folder
cli:
target: auto
paths: "iroha-cli/"
Expand All @@ -35,7 +35,6 @@ coverage:
target: auto
paths:
- "libs/"
- "schema/"
model:
target: auto
paths: "shared_model/"
Expand Down
6 changes: 4 additions & 2 deletions cmake/analysis.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@ else()
COMMAND ${CPPCHECK_BIN} --xml --xml-version=2 ${CMAKE_SOURCE_DIR}
-I ${CMAKE_SOURCE_DIR}/irohad/ # include (include_directories(...)
-I ${CMAKE_SOURCE_DIR}/iroha-cli/ # include
-I ${CMAKE_SOURCE_DIR}/test/ # include
-I ${CMAKE_SOURCE_DIR}/libs/ # include
-I ${CMAKE_SOURCE_DIR}/shared_model # include
-I ${CMAKE_SOURCE_DIR}/shared_model/ # include
-i ${CMAKE_SOURCE_DIR}/external/ # exclude
-i ${CMAKE_SOURCE_DIR}/schema/ # exclude
-i ${CMAKE_BINARY_DIR} --enable=all # exclude
-i ${CMAKE_BINARY_DIR} # exclude
--enable=all
2> ${REPORT_DIR}/cppcheck.xml
COMMENT "Analyzing sources with cppcheck" VERBATIM
)
Expand Down
2 changes: 1 addition & 1 deletion sonar-project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ sonar.cxx.cppcheck.reportPath=build/reports/cppcheck*.xml
sonar.cxx.vera.reportPath=build/reports/vera*.xml
sonar.cxx.xunit.reportPath=build/reports/xunit*.xml

sonar.cxx.includeDirectories=shared_model,libs,irohad
sonar.cxx.includeDirectories=shared_model,libs,irohad,test,iroha-cli
#sonar.cxx.includeDirectories=/usr/include/c++/5,/usr/include/i386-linux-gnu/c++/5,/usr/include,/usr/include/c++/5/tr1,/usr/include/linux,irohad,iroha-cli,libs,/usr/include/x86_64-linux-gnu/c++/5

0 comments on commit 4d6c823

Please sign in to comment.