Merge pull request #189 from david-antliff-imgtec/docker-coverage

Docker coverage
ConnectivityFoundry · Jun 14, 2016 · d773595 · d773595
2 parents f351317 + 0bfcc4f
commit d773595
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,6 @@
 cppcheck-result.xml
 *_out.xml
 staging/
-bin/
 *~
 *.o
 *.pyc
@@ -12,10 +11,12 @@ awa_clientd
 awa_serverd
 awa_bootstrapd
 test_*_runner
+valgrind/
 
 # CMake builds
 build/
 build.openwrt/
+.build_x86
 
 # Eclipse
 .project
@@ -31,3 +32,4 @@ daemon.log
 awa_clientd.log
 awa_serverd.log
 awa_bootstrapd.log
+
diff --git a/ci/ci.sh b/ci/ci.sh
@@ -66,7 +66,7 @@ make BUILD_DIR=$BUILD_DIR CMAKE_OPTIONS="$CMAKE_OPTIONS" tests
   LCOV_TRACEFILE_FILTERED=$(basename -s .info $LCOV_TRACEFILE)_filtered.info
   lcov --rc lcov_branch_coverage=1 --no-checksum --directory . --capture --output-file $LCOV_TRACEFILE
   lcov --rc lcov_branch_coverage=1 --remove $LCOV_TRACEFILE \
-       "api/tests/*" "api/src/unsupported*" "/usr/*" "$BUILD_DIR/*-src/*" \
+       "api/tests/*" "api/src/unsupported*" "core/tests/*" "/usr/*" "$BUILD_DIR/*-src/*" \
        --output-file $LCOV_TRACEFILE_FILTERED
   mkdir -p lcov-html
   (