[mapguide-commits] r8169 - in trunk/MgDev: . UnitTest/WebTier/DotNet/MgTestRunner

[svn_mapguide at osgeo.org]

Author: jng
Date: 2014-05-26 21:50:06 -0700 (Mon, 26 May 2014)
New Revision: 8169

Modified:
   trunk/MgDev/UnitTest/WebTier/DotNet/MgTestRunner/MgTestRunner.csproj
   trunk/MgDev/run_tests.bat
Log:
Merge in changes from 2.6:
 - run_tests.bat: Display return codes on failures and turn back on server test
 - Properly quote a path in MgTestRunner post-build

Modified: trunk/MgDev/UnitTest/WebTier/DotNet/MgTestRunner/MgTestRunner.csproj
===================================================================
--- trunk/MgDev/UnitTest/WebTier/DotNet/MgTestRunner/MgTestRunner.csproj	2014-05-27 04:48:00 UTC (rev 8168)
+++ trunk/MgDev/UnitTest/WebTier/DotNet/MgTestRunner/MgTestRunner.csproj	2014-05-27 04:50:06 UTC (rev 8169)
@@ -99,7 +99,7 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>copy /Y "$(SolutionDir)Libs\*.*" "$(TargetDir)"
-xcopy /S /Y /I $(SolutionDir)..\..\..\Common\MapGuideCommon\Resources "$(TargetDir)\Resources"</PostBuildEvent>
+xcopy /S /Y /I "$(SolutionDir)..\..\..\Common\MapGuideCommon\Resources" "$(TargetDir)\Resources"</PostBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
     <PreBuildEvent>call "$(SolutionDir)prebuild.bat" "$(ConfigurationName)" "$(PlatformName)"</PreBuildEvent>

Modified: trunk/MgDev/run_tests.bat
===================================================================
--- trunk/MgDev/run_tests.bat	2014-05-27 04:48:00 UTC (rev 8168)
+++ trunk/MgDev/run_tests.bat	2014-05-27 04:50:06 UTC (rev 8169)
@@ -22,6 +22,8 @@
 SET RUN_PHP_TESTS=1
 SET RUN_DOTNET_TESTS=1
 
+SET RETURN_CODE=0
+
 echo *************** TEST SUMMARY ******************
 echo Platform: %PLAT%
 echo Configuration: %CONF%
@@ -45,7 +47,10 @@
     SET TEST_COMPONENT=Build DotNet test runner
     pushd UnitTest\WebTier\DotNet
     msbuild /p:Configuration=%CONFIG%;Platform=%PLAT% /fl /flp:logfile=build.log DotNet.sln
-    if %ERRORLEVEL% neq 0 goto error
+    if "%ERRORLEVEL%" == "1" (
+        set RETURN_CODE=%ERRORLEVEL%
+        goto error
+    )
     popd
 )
 :start_mgserver
@@ -64,7 +69,10 @@
 pushd UnitTest
 SET TEST_COMPONENT=Prepare webtier test suites
 php -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 prepare.php
-if %ERRORLEVEL% neq 0 goto error
+if %ERRORLEVEL% neq 0 (
+    set RETURN_CODE=%ERRORLEVEL%
+    goto error
+)
 popd
 :start_php_webserver
 if "%START_WEBSERVER%" == "1" (
@@ -129,7 +137,7 @@
 )
 goto done
 :error
-echo [error]: An error occured with %TEST_COMPONENT%
+echo [error]: An error occured with %TEST_COMPONENT% (exit code: %RETURN_CODE%)
 goto quit
 :done