From fe27b63576c948834d2781d304cff74cb611f039 Mon Sep 17 00:00:00 2001
From: "Juergen E. Fischer" <jef@norbit.de>
Date: Fri, 30 Jan 2015 22:59:34 +0100
Subject: [PATCH] enable coverage in travis, debian builds and osgeo4w
 nightlies

---
 .travis.yml                            | 2 +-
 debian/rules                           | 2 +-
 ms-windows/osgeo4w/package-nightly.cmd | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 77e94f13cdd..f3329d8b934 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ before_install:
 install:
   - mkdir build
   - cd build
-  - cmake -DWITH_SERVER=ON -DWITH_STAGED_PLUGINS=OFF -DWITH_GRASS=OFF -DENABLE_COVERAGE=ON.. \
+  - cmake -DWITH_SERVER=ON -DWITH_STAGED_PLUGINS=OFF -DWITH_GRASS=OFF -DENABLE_COVERAGE=ON \
           -DSUPPRESS_QT_WARNINGS=ON -DENABLE_MODELTEST=ON -DWITH_QWTPOLAR=OFF ..
 
 script: xvfb-run ctest -V -E 'Atlas|atlas|PyQgsPalLabelingCanvas|PyQgsPalLabelingServer|qgis_wcsprovidertest' -S ../qgis-test-travis.ctest --output-on-failure
diff --git a/debian/rules b/debian/rules
index 7d584c72282..cf5507dcd8e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -97,7 +97,7 @@ endif
 ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	CMAKE_OPTS += -DENABLE_TESTS=FALSE
 else
-	CMAKE_OPTS += -DENABLE_TESTS=TRUE
+	CMAKE_OPTS += -DENABLE_TESTS=TRUE -DENABLE_COVERAGE=TRUE
 endif
 
 ifneq (,$(findstring $(DISTRIBUTION),"wheezy jessie trusty sid sid-oracle"))
diff --git a/ms-windows/osgeo4w/package-nightly.cmd b/ms-windows/osgeo4w/package-nightly.cmd
index 8f85ae95379..2bee64b910e 100644
--- a/ms-windows/osgeo4w/package-nightly.cmd
+++ b/ms-windows/osgeo4w/package-nightly.cmd
@@ -151,6 +151,7 @@ cmake %CMAKE_OPT% ^
 	-D WITH_ORACLE=TRUE ^
 	-D WITH_GRASS=TRUE ^
 	-D WITH_CUSTOM_WIDGETS=TRUE ^
+	-D ENABLE_COVERAGE=TRUE ^
 	-D CMAKE_BUILD_TYPE=%BUILDCONF% ^
 	-D CMAKE_CONFIGURATION_TYPES=%BUILDCONF% ^
 	-D GEOS_LIBRARY=%O4W_ROOT%/lib/geos_c.lib ^