Skip to content

Commit c6e9291

Browse files
timlinuxtimlinux
committedApr 14, 2012
Merge branch 'master' of github.com:qgis/Quantum-GIS
·
ltr-3_40Before-merge-new_vector_api
2 parents a3fea94 + 5148d5f commit c6e9291

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+57
-2
lines changed
 

‎debian/changelog

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ qgis (1.9.90) UNRELEASED; urgency=low
1212
* add mssqlprovider plugin
1313
* copyright & policy update (synced from debiangis)
1414
* run crssync in postinst
15+
* switch from test with check target instead of test
1516

16-
-- Jürgen E. Fischer <jef@norbit.de> Tue, 03 Apr 2012 00:20:18 +0200
17+
-- Jürgen E. Fischer <jef@norbit.de> Sat, 14 Apr 2012 10:39:28 +0200
1718

1819
qgis (1.8.0) UNRELEASED; urgency=low
1920

‎debian/rules

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,9 @@ build-stamp: debian/build/CMakeCache.txt
104104

105105
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
106106
# Code to run the package test suite - and ignore the outcome for now
107-
LD_LIBRARY_PATH=$(PWD)/debian/build/output/lib:$(LD_LIBRARY_PATH) $(MAKE) -C debian/build test || true
107+
LD_LIBRARY_PATH=$(PWD)/debian/build/output/lib:$(LD_LIBRARY_PATH) $(MAKE) -C debian/build check || true
108+
else
109+
echo Skipping tests.
108110
endif
109111

110112
touch $@

0 commit comments

Comments
 (0)
Please sign in to comment.