Skip to content
Permalink
Browse files
debian packaging: run tests with xvfb and upload results to dashboard
  • Loading branch information
jef-n committed Apr 18, 2012
1 parent 275bf7a commit aa44bfea592b79348659b7120cf5a2f2ebe5a663
Showing with 26 additions and 12 deletions.
  1. +2 −2 debian/changelog
  2. +2 −1 debian/control.lucid
  3. +2 −1 debian/control.maverick
  4. +2 −1 debian/control.natty
  5. +2 −1 debian/control.oneiric
  6. +2 −1 debian/control.precise
  7. +3 −2 debian/control.sid
  8. +2 −1 debian/control.squeeze
  9. +2 −1 debian/control.wheezy
  10. +7 −1 debian/rules
@@ -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

@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.
@@ -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
@@ -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
@@ -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

0 comments on commit aa44bfe

Please sign in to comment.