Skip to content
Permalink
Browse files
fix windows build and include tests runs in nightly build
  • Loading branch information
jef-n committed Nov 15, 2011
1 parent ed13141 commit 295bf55a5b1afc891140db7a79cee1cb34266216
Showing with 8 additions and 5 deletions.
  1. +4 −0 ms-windows/osgeo4w/package-nightly.cmd
  2. +2 −3 src/app/qgisapp.cpp
  3. +2 −2 tests/src/core/testqgsexpression.cpp
@@ -130,6 +130,10 @@ echo ALL_BUILD: %DATE% %TIME%>>%LOG% 2>&1
%DEVENV% qgis%VERSION%.sln /Project ALL_BUILD /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1
if errorlevel 1 goto error

echo RUN_TESTS: %DATE% %TIME%>>%LOG% 2>&1
%DEVENV% qgis%VERSION%.sln /Project RUN_TESTS /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1
if errorlevel 1 echo "TESTS WERE NOT SUCCESSFUL."

echo INSTALL: %DATE% %TIME%>>%LOG% 2>&1
%DEVENV% qgis%VERSION%.sln /Project INSTALL /Build %BUILDCONF% /Out %LOG%>>%LOG% 2>&1
if errorlevel 1 goto error
@@ -227,15 +227,14 @@
//
// Conditional Includes
//
#ifdef HAVE_POSTGRESQL
#include "../providers/postgres/qgspgsourceselect.h"
#ifdef HAVE_PGCONFIG
#include <pg_config.h>
#else
#define PG_VERSION "unknown"
#endif
#endif

#include <sqlite3.h>

#ifdef HAVE_SPATIALITE
extern "C"
{
@@ -198,10 +198,10 @@ class TestQgsExpression: public QObject
QTest::newRow( "atan2(0,1)" ) << "atan2(0,1)" << false << QVariant( 0. );
QTest::newRow( "atan2(1,0)" ) << "atan2(1,0)" << false << QVariant( M_PI / 2 );
QTest::newRow( "exp(0)" ) << "exp(0)" << false << QVariant( 1. );
QTest::newRow( "exp(1)" ) << "exp(1)" << false << QVariant( exp( 1 ) );
QTest::newRow( "exp(1)" ) << "exp(1)" << false << QVariant( exp( 1. ) );
QTest::newRow( "ln(0)" ) << "ln(0)" << false << QVariant();
QTest::newRow( "log10(-1)" ) << "log10(-1)" << false << QVariant();
QTest::newRow( "ln(1)" ) << "ln(1)" << false << QVariant( log( 1 ) );
QTest::newRow( "ln(1)" ) << "ln(1)" << false << QVariant( log( 1. ) );
QTest::newRow( "log10(100)" ) << "log10(100)" << false << QVariant( 2. );
QTest::newRow( "log(2,32)" ) << "log(2,32)" << false << QVariant( 5. );
QTest::newRow( "log(10,1000)" ) << "log(10,1000)" << false << QVariant( 3. );

0 comments on commit 295bf55

Please sign in to comment.