osgeo4w: fix running of grass test

jef-n · jef-n · commit 51a7317c7210 · 2015-04-17T17:55:47.000+02:00
diff --git a/ms-windows/osgeo4w/package-nightly.cmd b/ms-windows/osgeo4w/package-nightly.cmd
@@ -198,11 +198,23 @@ cmake --build %BUILDDIR% --config %BUILDCONF%
 if errorlevel 1 cmake --build %BUILDDIR% --config %BUILDCONF%
 if errorlevel 1 (echo build failed twice & goto error)
 
-if not exist ..\skiptests (
-	echo RUN_TESTS: %DATE% %TIME%
-	cmake --build %BUILDDIR% --target Nightly --config %BUILDCONF%
-	if errorlevel 1 echo TESTS WERE NOT SUCCESSFUL.
+if exist ..\skiptests goto skiptests
+
+echo RUN_TESTS: %DATE% %TIME%
+
+set oldpath=%PATH%
+for %%g IN (%GRASS_VERSIONS%) do (
+	set path=!path!;%OSGEO4W_ROOT%\apps\grass\grass-%%g\lib
+	set GISBASE=%OSGEO4W_ROOT%\apps\grass\grass-%%g
 )
+PATH %path%;%BUILDDIR%\output\plugins\%BUILDCONF%
+
+cmake --build %BUILDDIR% --target RUN_TESTS --config %BUILDCONF%
+if errorlevel 1 echo TESTS WERE NOT SUCCESSFUL.
+
+PATH %oldpath%
+
+:skiptests
 
 if exist %PKGDIR% (
 	echo REMOVE: %DATE% %TIME%
diff --git a/tests/src/providers/grass/testqgsgrassprovider.cpp b/tests/src/providers/grass/testqgsgrassprovider.cpp
@@ -45,8 +45,8 @@ class TestQgsGrassProvider: public QObject
   private slots:
     void initTestCase();// will be called before the first testfunction is executed.
     void cleanupTestCase();// will be called after the last testfunction was executed.
-    void init() {};// will be called before each testfunction is executed.
-    void cleanup() {};// will be called after every testfunction.
+    void init() {} // will be called before each testfunction is executed.
+    void cleanup() {} // will be called after every testfunction.
 
     void vectorLayers();
   private:
