Skip to content
Permalink
Browse files
Merge branch 'master' of github.com:qgis/Quantum-GIS
  • Loading branch information
mach0 committed Apr 14, 2012
2 parents 8c3f2a1 + 0a2fdb6 commit 5148d5f3f60bb1d994361e8b2c3039a8ada33215
Showing with 11 additions and 2 deletions.
  1. +2 −1 debian/changelog
  2. +3 −1 debian/rules
  3. +6 −0 tests/src/core/testqgscoordinatereferencesystem.cpp
@@ -12,8 +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

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

qgis (1.8.0) UNRELEASED; urgency=low

@@ -104,7 +104,9 @@ 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 test || true
LD_LIBRARY_PATH=$(PWD)/debian/build/output/lib:$(LD_LIBRARY_PATH) $(MAKE) -C debian/build check || true
else
echo Skipping tests.
endif

touch $@
@@ -24,6 +24,9 @@ Email : sherman at mrcc dot com
#include <qgscoordinatereferencesystem.h>
#include <qgis.h>

#include <proj_api.h>
#include <gdal.h>

class TestQgsCoordinateReferenceSystem: public QObject
{
Q_OBJECT
@@ -296,6 +299,9 @@ void TestQgsCoordinateReferenceSystem::debugPrint(
{
QgsDebugMsg( "* Units : degrees" );
}

QgsDebugMsg( QString( "** GDAL version: %1" ).arg( GDAL_RELEASE_NAME ) );
QgsDebugMsg( QString( "** PROJ.4 version: %1" ).arg( PJ_VERSION ) );
}

QTEST_MAIN( TestQgsCoordinateReferenceSystem )

0 comments on commit 5148d5f

Please sign in to comment.