diff options
| author | Wolfgang Schupp <w.schupp@a1.net> | 2016-07-19 12:10:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-19 12:10:38 +0200 |
| commit | 82e30af27000e47abff3fb687135d70d6b90ad2e (patch) | |
| tree | 11efd0934fcbcaa91aa85b2a1764abd1d9ef99c7 /tools | |
| parent | 2cac3e385eda993bc3557b10f37fcc8673336aa5 (diff) | |
| parent | d510c7d4b64cfa184b923d3cd0aa9218a3f5881a (diff) | |
Merge pull request #10095 from fetzerch/cmake_codecoverage
[cmake/linux] Code coverage
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/buildsteps/linux64/run-tests | 6 | ||||
| -rw-r--r-- | tools/depends/target/cmakebuildsys/Makefile | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/tools/buildsteps/linux64/run-tests b/tools/buildsteps/linux64/run-tests index 265ff01985..abcaea49fa 100755 --- a/tools/buildsteps/linux64/run-tests +++ b/tools/buildsteps/linux64/run-tests @@ -4,7 +4,11 @@ XBMC_PLATFORM_DIR=linux64 if [ "$CMAKE_BUILD" = true ]; then cd $WORKSPACE/build;make -j$BUILDTHREADS kodi-test - cd $WORKSPACE;build/kodi-test --gtest_output=xml:gtestresults.xml + if [ "$Configuration" != "Coverage" ]; then + cd $WORKSPACE;build/kodi-test --gtest_output=xml:gtestresults.xml + else + cd $WORKSPACE/build;GTEST_OUTPUT="xml:$WORKSPACE/gtestresults.xml" make coverage + fi else cd $WORKSPACE;make -j$BUILDTHREADS testsuite cd $WORKSPACE;./kodi-test --gtest_output=xml:gtestresults.xml diff --git a/tools/depends/target/cmakebuildsys/Makefile b/tools/depends/target/cmakebuildsys/Makefile index 60a88e153d..1b3207eafa 100644 --- a/tools/depends/target/cmakebuildsys/Makefile +++ b/tools/depends/target/cmakebuildsys/Makefile @@ -5,7 +5,7 @@ APP_NAME=$(shell awk '/APP_NAME/ {print tolower($$2)}' $(VERSION.TXT)) all: mkdir -p $(XBMCROOT)/build - cd $(XBMCROOT)/build; $(CMAKE) $(XBMCROOT)/project/cmake + cd $(XBMCROOT)/build; $(CMAKE) -DCMAKE_BUILD_TYPE=$(Configuration) $(XBMCROOT)/project/cmake clean: cd $(XBMCROOT)/build; $(MAKE) clean |