Fail on error.

Correct tomcat port.

svn path=/branches/mainsoft/gh3.0preview1/mcs/; revision=103796

diff --git a/mcs/class/System.Web.Extensions/run-tests.cmd b/mcs/class/System.Web.Extensions/run-tests.cmd
index 3205c5e68d3c5e156eee27ab2f9ec92736c8e092..a52a1656567fa27c7c85160e832d5a9513aa91d6 100644 (file)
--- a/mcs/class/System.Web.Extensions/run-tests.cmd
+++ b/mcs/class/System.Web.Extensions/run-tests.cmd
@@ -24,9 +24,10 @@ if NOT "%SELENIUM_HOME%" == "" goto after_set_SELENIUM_HOME
 set SELENIUM_HOME=%~dp0\r
 set SELENIUM_HOME=%SELENIUM_HOME:class\System.Web.Extensions=selenium%\r
 :after_set_SELENIUM_HOME\r
+echo SELENIUM_HOME=%SELENIUM_HOME%\r
 \r
 set Browser=C:\Program Files\Internet Explorer\iexplore.exe\r
-set HTTPServer=http://localhost:8090\r
+set HTTPServer=http://localhost:8080\r
 set SeleniumURL=%HTTPServer%/Selenium\r
 \r
 rem =================================================\r
@@ -53,7 +54,7 @@ rem DEPLOY SELENIUM WITH TESTS TO SERVER
 rem ====================================\r
 if DEFINED SKIP_SELENIUM goto after_selenium\r
 echo Deploying Selenium\r
-call %SELENIUM_HOME%\DeploySelenium.cmd "Tomcat" "%SELENIUM_HOME%\TomcatDeploy.cmd" "http://admin:admin@localhost:8090" >>%BUILD_LOG% 2<&1\r
+call %SELENIUM_HOME%\DeploySelenium.cmd "Tomcat" "%SELENIUM_HOME%\TomcatDeploy.cmd" "http://admin:admin@localhost:8080" >>%BUILD_LOG% 2<&1\r
 :after_selenium\r
 \r
 rem BUILD APPLICATION UNDER TEST\r
@@ -62,7 +63,8 @@ if DEFINED SKIP_APP goto after_app
 pushd Test\AUT\r
 echo Building %cd%\SystemWebExtensionsAUT.JavaEE.csproj\r
 del /F /Q bin_Java\deployedFiles bin_Java\outputFiles.list\r
-msbuild SystemWebExtensionsAUT.JavaEE.csproj /t:Deploy /p:Configuration=Debug_Java >>%BUILD_LOG% 2<&1\r
+msbuild SystemWebExtensionsAUT.JavaEE.csproj /t:Rebuild /t:Deploy /p:Configuration=Debug_Java >>%BUILD_LOG% 2<&1\r
+IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
 popd\r
 :after_app\r
 \r
@@ -115,6 +117,14 @@ if NOT %ResultsAsHtml%=="" (
 )\r
 \r
 exit /B\r
+\r
+goto END\r
+:BUILD_EXCEPTION\r
+@echo Error in building solutions. See %BUILD_LOG% for details...\r
+REM EXIT 1\r
+GOTO END\r
+\r
 :afterExecuteTestSuite\r
+:END\r
+endlocal\r
 \r
-endlocal
\ No newline at end of file