[mapguide-commits] r8164 - trunk/MgDev

[svn_mapguide at osgeo.org]

Author: jng
Date: 2014-05-26 10:01:06 -0700 (Mon, 26 May 2014)
New Revision: 8164

Modified:
   trunk/MgDev/run_tests.bat
Log:
Clear out any test dbs before running a PHP or .net web tier test suite to eliminate the possibility of DBs from a PHP run tainting the results of the .net one and vice versa.

Modified: trunk/MgDev/run_tests.bat
===================================================================
--- trunk/MgDev/run_tests.bat	2014-05-26 16:57:09 UTC (rev 8163)
+++ trunk/MgDev/run_tests.bat	2014-05-26 17:01:06 UTC (rev 8164)
@@ -44,7 +44,7 @@
     echo [build]: DotNet test runner
     SET TEST_COMPONENT=Build DotNet test runner
     pushd UnitTest\WebTier\DotNet
-    msbuild /p:Configuration=%CONFIG%;Platform=%PLAT% DotNet.sln
+    msbuild /p:Configuration=%CONFIG%;Platform=%PLAT% /fl /flp:logfile=build.log DotNet.sln
     if %ERRORLEVEL% neq 0 goto error
     popd
 )
@@ -75,6 +75,20 @@
 :test_php
 if "%RUN_PHP_TESTS%" == "1" (
     echo [test]: PHP tests
+    REM Clear out old dbs before running
+    pushd UnitTest\TestData
+    if exist Unicode\UnicodeTest.db del /F Unicode\UnicodeTest.db
+    if exist WmsTest\WmsTest.db del /F WmsTest\WmsTest.db
+    if exist WebLayout\WebLayoutTest.db del /F WebLayout\WebLayoutTest.db
+    if exist WfsTest\WfsTest.db del /F WfsTest\WfsTest.db
+    if exist MapLayer\MapLayerTest.db del /F MapLayer\MapLayerTest.db
+    if exist ServerAdmin\ServerAdminTest.db del /F ServerAdmin\ServerAdminTest.db
+    if exist MappingService\MappingServiceTest.db del /F MappingService\MappingServiceTest.db
+    if exist SiteService\SiteServiceTest.db del /F SiteService\SiteServiceTest.db
+    if exist FeatureService\FeatureServiceTest.db del /F FeatureService\FeatureServiceTest.db
+    if exist DrawingService\DrawingServiceTest.db del /F DrawingService\DrawingServiceTest.db
+    if exist ResourceService\ResourceServiceTest.db del /F ResourceService\ResourceServiceTest.db
+    popd
     pushd UnitTest\WebTier\Php
     php.exe -n -d display_errors=Off -d extension_dir="%PHP_EXT_DIR%" -d extension=php_mbstring.dll -d extension=php_curl.dll -d extension=php_MapGuideApi.dll -d extension=php_SQLitePhpApi.dll RunTests.php
     popd
@@ -82,6 +96,20 @@
 :test_dotnet
 if "%RUN_DOTNET_TESTS%" == "1" (
     echo [test]: .net tests
+    REM Clear out old dbs before running
+    pushd UnitTest\TestData
+    if exist Unicode\UnicodeTest.db del /F Unicode\UnicodeTest.db
+    if exist WmsTest\WmsTest.db del /F WmsTest\WmsTest.db
+    if exist WebLayout\WebLayoutTest.db del /F WebLayout\WebLayoutTest.db
+    if exist WfsTest\WfsTest.db del /F WfsTest\WfsTest.db
+    if exist MapLayer\MapLayerTest.db del /F MapLayer\MapLayerTest.db
+    if exist ServerAdmin\ServerAdminTest.db del /F ServerAdmin\ServerAdminTest.db
+    if exist MappingService\MappingServiceTest.db del /F MappingService\MappingServiceTest.db
+    if exist SiteService\SiteServiceTest.db del /F SiteService\SiteServiceTest.db
+    if exist FeatureService\FeatureServiceTest.db del /F FeatureService\FeatureServiceTest.db
+    if exist DrawingService\DrawingServiceTest.db del /F DrawingService\DrawingServiceTest.db
+    if exist ResourceService\ResourceServiceTest.db del /F ResourceService\ResourceServiceTest.db
+    popd
     pushd UnitTest\WebTier\DotNet_%PLAT%
     MgTestRunner.exe "%WEBCONFIGINI%" "../../../Oem/CsMap/Dictionaries"
     if %ERRORLEVEL% neq 0 echo [test]: .net test runner had one or more test failures. Check log files for more information