Fix failures when running tests in J2EE mode

[mono.git] / mcs / class / System.Web / run-mono-tests.bat

diff --git a/mcs/class/System.Web/run-mono-tests.bat b/mcs/class/System.Web/run-mono-tests.bat
index 0d72832b73fdfdaba691475595e17d9e14125c75..6a1cb7f72a9a52a92cbb0deca5ec4c938b78c41c 100755 (executable)
--- a/mcs/class/System.Web/run-mono-tests.bat
+++ b/mcs/class/System.Web/run-mono-tests.bat
@@ -1,4 +1,4 @@
-@echo ff\r
+@echo off\r
 REM ********************************************************\r
 REM This batch file receives the follwing parameters:\r
 REM build/rebuild (optional): should the solution file be rebuilded \r
@@ -24,6 +24,7 @@ REM ********************************************************
 set OUTPUT_FILE_PREFIX=System_Web\r
 set RUNNING_FIXTURE=System.Web\r
 set TEST_SOLUTION=Test\TestMonoWeb.J2EE20.sln\r
+set DEPLOY_PROJECT=Test\mainsoft\MainsoftWebApp20\MainsoftWebApp20.csproj\r
 set TEST_ASSEMBLY=TestMonoWeb.jar\r
 set PROJECT_CONFIGURATION=Debug_Java20\r
 \r
@@ -44,6 +45,7 @@ REM @echo Set environment
 REM ********************************************************\r
 \r
 set JGAC_PATH=%VMW_HOME%\jgac\vmw4j2ee_110\\r
+set TOMCAT_PATH=%VMW_HOME%\jakarta-tomcat\common\lib\\r
 set JAVA_HOME=%VMW_HOME%\jre5\r
 \r
 set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar\r
@@ -59,6 +61,8 @@ set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%VMW_HOME%\jgac\jdbc\derby.jar
 \r
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;Test\mainsoft\NunitWeb\NunitWeb\bin\Debug_Java20\NunitWeb.jar\r
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;Test\mainsoft\NunitWeb\NunitWeb\bin\Debug_Java20\HtmlCompare.jar\r
+\r
+set TOMCAT_CLASSPATH=%TOMCAT_PATH%servlet-api.jar\r
 set NUNIT_OPTIONS=/exclude=NotWorking\r
 \r
 if "%GH_VERSION%"=="" (\r
@@ -78,13 +82,28 @@ set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%NUNIT_PATH%nunit-console\bin\%PROJECT_CON
 set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;.\r
 set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%TEST_ASSEMBLY%\r
 \r
-set CLASSPATH="%RUNTIME_CLASSPATH%;%NUNIT_CLASSPATH%"\r
+set CLASSPATH="%RUNTIME_CLASSPATH%;%NUNIT_CLASSPATH%;%TOMCAT_CLASSPATH%"\r
 \r
 REM ********************************************************\r
 @echo Building GH solution...\r
 REM ********************************************************\r
+xcopy /y Test\mainsoft\NunitWeb\NunitWeb\Resources\*.as* Test\mainsoft\MainsoftWebApp20\\r
+xcopy /y Test\mainsoft\NunitWeb\NunitWeb\Resources\*.master Test\mainsoft\MainsoftWebApp20\\r
+xcopy /y Test\mainsoft\NunitWebResources\*.* Test\mainsoft\MainsoftWebApp20\\r
+pushd Test\mainsoft\MainsoftWebApp20\\r
+xcopy /y WizardTest.skin App_Themes\Theme1\\r
+xcopy /y Theme1.skin App_Themes\Theme1\\r
+xcopy /y Theme2.skin App_Themes\Theme2\\r
+mkdir XXX\r
+for %%i in (*.as*) DO sed "s/CodeFile=/CodeBehind=/" %%i > XXX\%%i\r
+move /Y XXX\* .\r
+rmdir XXX\r
+popd\r
 \r
 msbuild %TEST_SOLUTION% /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1\r
+IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
+echo msbuild %DEPLOY_PROJECT% /t:Deploy /p:Configuration=%PROJECT_CONFIGURATION% /p:Platform=AnyCPU >>%BUILD_LOG% \r
+msbuild %DEPLOY_PROJECT% /t:Deploy /p:Configuration=%PROJECT_CONFIGURATION% /p:Platform=AnyCPU >>%BUILD_LOG% 2<&1\r
 \r
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
 \r
@@ -129,7 +148,7 @@ set XML_TOOL_PATH=..\..\tools\mono-xmltool
 \r
 if "%XMLTOOL_BUILD%" == "DONE" goto XMLTOOLSKIP\r
 \r
-msbuild %XML_TOOL_PATH%\XmlTool20.vmwcsproj /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1\r
+msbuild %XML_TOOL_PATH%\XmlTool20.csproj /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1\r
 \r
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
 \r