Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
debian packaging:
- add dependency for qgis-server on python3-qgis
- set test timeouts to 60s

osgeo4w:
- set test timeouts to 60s
  • Loading branch information
jef-n committed Aug 10, 2019
1 parent bc1aea6 commit bf31ce1
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions debian/control.in
Expand Up @@ -461,6 +461,7 @@ Package: qgis-server
Architecture: any
Depends:
qgis-providers (= ${binary:Version}),
python3-qgis (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
Conflicts: qgis-mapserver
Expand Down
2 changes: 1 addition & 1 deletion debian/rules
Expand Up @@ -149,7 +149,7 @@ endif
ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
CMAKE_OPTS += -DENABLE_TESTS=FALSE
else
CMAKE_OPTS += -DENABLE_TESTS=TRUE
CMAKE_OPTS += -DENABLE_TESTS=TRUE -DDART_TESTING_TIMEOUT=60
endif

CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
Expand Down
1 change: 1 addition & 0 deletions ms-windows/osgeo4w/package-nightly.cmd
Expand Up @@ -169,6 +169,7 @@ cmake -G "%CMAKEGEN%" ^
-D QCA_INCLUDE_DIR=%OSGEO4W_ROOT%\apps\Qt5\include\QtCrypto ^
-D QCA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qca-qt5.lib ^
-D QSCINTILLA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qscintilla2.lib ^
-D DART_TESTING_TIMEOUT=60 ^
%CMAKE_OPT% ^
%SRCDIR:\=/%
if errorlevel 1 (echo cmake failed & goto error)
Expand Down
1 change: 1 addition & 0 deletions ms-windows/osgeo4w/package.cmd
Expand Up @@ -164,6 +164,7 @@ cmake -G "%CMAKEGEN%" ^
-D QCA_INCLUDE_DIR=%OSGEO4W_ROOT%\apps\Qt5\include\QtCrypto ^
-D QCA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qca-qt5.lib ^
-D QSCINTILLA_LIBRARY=%OSGEO4W_ROOT%\apps\Qt5\lib\qscintilla2.lib ^
-D DART_TESTING_TIMEOUT=60 ^
%CMAKE_OPT% ^
%SRCDIR:\=/%
if errorlevel 1 (echo cmake failed & goto error)
Expand Down

0 comments on commit bf31ce1

Please sign in to comment.