debian packaging: run tests with xvfb and upload results to dashboard

qgis · Apr 18, 2012 · aa44bfe · aa44bfe
1 parent 275bf7a
commit aa44bfe
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 12 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -12,9 +12,9 @@ qgis (1.9.90) UNRELEASED; urgency=low
   * add mssqlprovider plugin
   * copyright & policy update (synced from debiangis)
   * run crssync in postinst
-  * switch from test with check target instead of test
+  * run tests with xvfb and upload to results to (c)dashboard
 
- -- Jürgen E. Fischer <jef@norbit.de>  Sat, 14 Apr 2012 10:39:28 +0200
+ -- Jürgen E. Fischer <jef@norbit.de>  Wed, 18 Apr 2012 20:50:12 +0200
 
 qgis (1.8.0) UNRELEASED; urgency=low
 

diff --git a/debian/control.lucid b/debian/control.lucid
@@ -32,7 +32,8 @@ Build-Depends:
  git-core,
  doxygen,
  graphviz,
- txt2tags
+ txt2tags,
+ xvfb, xauth, xfonts-base
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.4
 XS-Python-Version: current

diff --git a/debian/control.maverick b/debian/control.maverick
@@ -33,7 +33,8 @@ Build-Depends:
  git,
  doxygen,
  graphviz,
- txt2tags 
+ txt2tags,
+ xvfb, xauth, xfonts-base
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.4
 XS-Python-Version: current

diff --git a/debian/control.natty b/debian/control.natty
@@ -33,7 +33,8 @@ Build-Depends:
  git,
  doxygen,
  graphviz,
- txt2tags
+ txt2tags,
+ xvfb, xauth, xfonts-base
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.4
 XS-Python-Version: current

diff --git a/debian/control.oneiric b/debian/control.oneiric
@@ -33,7 +33,8 @@ Build-Depends:
  git,
  doxygen,
  graphviz,
- txt2tags
+ txt2tags,
+ xvfb, xauth, xfonts-base
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.4
 XS-Python-Version: current

diff --git a/debian/control.precise b/debian/control.precise
@@ -36,7 +36,8 @@ Build-Depends:
  git,
  doxygen,
  graphviz,
- txt2tags
+ txt2tags,
+ xvfb, xauth, xfonts-base
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.4
 XS-Python-Version: current

diff --git a/debian/control.sid b/debian/control.sid
@@ -35,7 +35,8 @@ Build-Depends:
  git,
  doxygen,
  graphviz,
- txt2tags
+ txt2tags,
+ xvfb, xauth, xfonts-base
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.9.3
 X-Python-Version: current
@@ -129,7 +130,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data
 Package: python-qgis
 Section: python
 Architecture: any
-Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
+Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-pyspatialite, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
 Description: Python bindings to Quantum GIS
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

diff --git a/debian/control.squeeze b/debian/control.squeeze
@@ -32,7 +32,8 @@ Build-Depends:
  git,
  doxygen,
  graphviz,
- txt2tags
+ txt2tags,
+ xvfb, xauth, xfonts-base
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.8.4
 XS-Python-Version: current

diff --git a/debian/control.wheezy b/debian/control.wheezy
@@ -35,7 +35,8 @@ Build-Depends:
  git,
  doxygen,
  graphviz,
- txt2tags
+ txt2tags,
+ xvfb, xauth, xfonts-base
 Build-Conflicts: libqgis-dev, qgis-dev
 Standards-Version: 3.9.3
 X-Python-Version: current

diff --git a/debian/rules b/debian/rules
@@ -9,6 +9,8 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+DEB_TEST_TARGET ?= Experimental
+
 DISTRIBUTION := $(shell dpkg-parsechangelog --format rfc822 | sed -ne "s/^Distribution: //p")
 ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"lenny squeeze wheezy lucid maverick natty oneiric precise"))
 DISTRIBUTION := sid
@@ -32,6 +34,10 @@ CMAKE_OPTS := \
 	-D QGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \
 	-D WITH_APIDOC=TRUE
 
+ifneq (,$(findstring $(DISTRIBUTION),"sid"))
+	-D WITH_PYSPATIALITE=FALSE
+endif
+
 ifneq (,$(findstring $(DISTRIBUTION),"lenny squeeze lucid maverick natty oneiric"))
 	CMAKE_OPTS += -D WITH_INTERNAL_SPATIALITE=TRUE
 else
@@ -104,7 +110,7 @@ build-stamp: debian/build/CMakeCache.txt
 
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	# Code to run the package test suite - and ignore the outcome for now
-	LD_LIBRARY_PATH=$(PWD)/debian/build/output/lib:$(LD_LIBRARY_PATH) $(MAKE) -C debian/build check || true
+	LD_LIBRARY_PATH=$(PWD)/debian/build/output/lib:$(LD_LIBRARY_PATH) xvfb-run -a -n 1 -s "-screen 0 1280x1024x24" $(MAKE) -C debian/build $(DEB_TEST_TARGET) || true
 else
 	echo Skipping tests.
 endif