File tree 2 files changed +6
-1
lines changed
2 files changed +6
-1
lines changed Original file line number Diff line number Diff line change @@ -7,9 +7,10 @@ qgis (1.9.0) UNRELEASED; urgency=low
7
7
* include cpt-city files
8
8
* support DEB_BUILD_OPTIONS' parallel=n
9
9
* add python-unittest2 build dependency for maverick and squeeze
10
+ * disable PyQgsRectangle test on lucid (depends on unittest2)
10
11
* add python-qscintilla2 dependency to python-qgis
11
12
12
- -- Jürgen E. Fischer <jef@norbit.de> Mon, 17 Sep 2012 18:08:47 +0200
13
+ -- Jürgen E. Fischer <jef@norbit.de> Tue, 18 Sep 2012 22: 18:25 +0200
13
14
14
15
qgis (1.8.0) UNRELEASED; urgency=low
15
16
Original file line number Diff line number Diff line change @@ -27,6 +27,10 @@ TESTMAKE=xvfb-run -a -n 1 -s "-screen 0 1280x1024x24 -dpi 96" $(MAKE)
27
27
else
28
28
TESTMAKE =$(MAKE )
29
29
endif
30
+ ifneq (,$(findstring $(DISTRIBUTION ) ,"lucid") )
31
+ # excludes tests requiring unittest2 not available on lucid
32
+ TESTMAKE += ARGS="-E PyQgsRectangle"
33
+ endif
30
34
31
35
QGIS_MAJOR =$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_MAJOR "\([0-9]* \) ")/\1/p' CMakeLists.txt)
32
36
QGIS_MINOR =$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_MINOR "\([0-9]* \) ")/\1/p' CMakeLists.txt)
You can’t perform that action at this time.
0 commit comments