X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Web%2Frun-mono-tests.bat;h=d224c86b6aa347e712a758a10737cfb35a037c9a;hb=9e69b172c706428cd130566b0f45fd42155aa7e1;hp=2ed53b96b71138a15d1e8fd70bf5a49904d0ccd4;hpb=9975a45f43793e34318e593ddacd3f332f8d91c0;p=mono.git

diff --git a/mcs/class/System.Web/run-mono-tests.bat b/mcs/class/System.Web/run-mono-tests.bat
index 2ed53b96b71..d224c86b6aa 100755
--- a/mcs/class/System.Web/run-mono-tests.bat
+++ b/mcs/class/System.Web/run-mono-tests.bat
@@ -1,4 +1,4 @@
-@echo ff
+@echo off
 REM ********************************************************
 REM This batch file receives the follwing parameters:
 REM build/rebuild (optional): should the solution file be rebuilded 
@@ -24,6 +24,7 @@ REM ********************************************************
 set OUTPUT_FILE_PREFIX=System_Web
 set RUNNING_FIXTURE=System.Web
 set TEST_SOLUTION=Test\TestMonoWeb.J2EE20.sln
+set DEPLOY_PROJECT=Test\mainsoft\MainsoftWebApp20\MainsoftWebApp20.csproj
 set TEST_ASSEMBLY=TestMonoWeb.jar
 set PROJECT_CONFIGURATION=Debug_Java20
 
@@ -43,21 +44,27 @@ REM ********************************************************
 REM @echo Set environment
 REM ********************************************************
 
-set JGAC_PATH=%VMW_HOME%\jgac\vmw4j2ee_110\
-set JAVA_HOME=%VMW_HOME%\jre5
+set JGAC_PATH=%VMW_HOME%\java_refs\framework\
+set TOMCAT_PATH=%VMW_HOME%\jakarta-tomcat\common\lib\
+set JAVA_HOME=%VMW_HOME%\jre
 
 set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.jar
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.Xml.jar
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.Web.jar
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.Runtime.Serialization.Formatters.Soap.jar
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%Mainsoft.Web.jar
 rem set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.Drawing.jar
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%J2SE.Helpers.jar
 
-set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%VMW_HOME%\jgac\jdbc\derby.jar
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%VMW_HOME%\java_refs\jdbc\derby.jar
+
+rem ./Test/mainsoft/MainsoftWebTest/bin/Debug_Java20/HtmlCompare.jar
 
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;Test\mainsoft\NunitWeb\NunitWeb\bin\Debug_Java20\NunitWeb.jar
-set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;Test\mainsoft\NunitWeb\NunitWeb\bin\Debug_Java20\HtmlCompare.jar
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;Test\mainsoft\MainsoftWebTest\bin\Debug_Java20\HtmlCompare.jar
+
+set TOMCAT_CLASSPATH=%TOMCAT_PATH%servlet-api.jar
 set NUNIT_OPTIONS=/exclude=NotWorking
 
 if "%GH_VERSION%"=="" (
@@ -77,13 +84,45 @@ set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%NUNIT_PATH%nunit-console\bin\%PROJECT_CON
 set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;.
 set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%TEST_ASSEMBLY%
 
-set CLASSPATH="%RUNTIME_CLASSPATH%;%NUNIT_CLASSPATH%"
+set CLASSPATH="%RUNTIME_CLASSPATH%;%NUNIT_CLASSPATH%;%TOMCAT_CLASSPATH%"
 
 REM ********************************************************
 @echo Building GH solution...
 REM ********************************************************
+xcopy /y Test\mainsoft\NunitWeb\NunitWeb\Resources\*.as* Test\mainsoft\MainsoftWebApp20\
+xcopy /y Test\mainsoft\NunitWeb\NunitWeb\Resources\*.master Test\mainsoft\MainsoftWebApp20\
+xcopy /y Test\mainsoft\NunitWebResources\*.* Test\mainsoft\MainsoftWebApp20\
+pushd Test\mainsoft\MainsoftWebApp20\
+xcopy /y WizardTest.skin App_Themes\Theme1\
+xcopy /y Theme1.skin App_Themes\Theme1\
+xcopy /y Theme2.skin App_Themes\Theme2\
+xcopy /y ResolveUrl.ascx Folder\
+mkdir XXX
+for %%i in (*.as*) DO sed "s/CodeFile=/CodeBehind=/" %%i > XXX\%%i
+move /Y XXX\* .
+rmdir XXX
+popd
 
 msbuild %TEST_SOLUTION% /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1
+IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
+
+REM ********************************************************
+@echo Deploying GH solution to tomcat...
+REM ********************************************************
+IF NOT DEFINED VMW_BUILDER GOTO MSBUILD_DEPLOY
+set CATALINA_HOME=%VMW_HOME%\jakarta-tomcat
+call "%VMW_HOME%\jakarta-tomcat\bin\shutdown.bat"
+echo Waiting 5 sec for tomcat to stop....
+@ping 127.0.0.1 -n 5 -w 1000 > nul
+xcopy /Y Test\mainsoft\MainsoftWebApp20\bin\%PROJECT_CONFIGURATION%\MainsoftWebApp20.war "%VMW_HOME%\jakarta-tomcat\webapps"
+call "%VMW_HOME%\jakarta-tomcat\bin\startup.bat"
+echo Waiting 5 sec for tomcat to start....
+@ping 127.0.0.1 -n 5 -w 1000 > nul
+GOTO AFTER_DEPLOY
+:MSBUILD_DEPLOY
+echo msbuild %DEPLOY_PROJECT% /t:Deploy /p:Configuration=%PROJECT_CONFIGURATION% /p:Platform=AnyCPU >>%BUILD_LOG% 
+msbuild %DEPLOY_PROJECT% /t:Deploy /p:Configuration=%PROJECT_CONFIGURATION% /p:Platform=AnyCPU >>%BUILD_LOG% 2<&1
+:AFTER_DEPLOY
 
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
 
@@ -121,15 +160,30 @@ REM @echo on
 "%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi %TEST_ASSEMBLY% %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML% >>%RUN_LOG% 2<&1
 REM @echo off
 
-
+IF NOT DEFINED VMW_BUILDER GOTO DONT_SHUTDOWN_TOMCAT
+set CATALINA_HOME=%VMW_HOME%\jakarta-tomcat
+call "%VMW_HOME%\jakarta-tomcat\bin\shutdown.bat"
+:DONT_SHUTDOWN_TOMCAT
 
 REM ********************************************************
 @echo Build XmlTool
 REM ********************************************************
 set XML_TOOL_PATH=..\..\tools\mono-xmltool
-msbuild %XML_TOOL_PATH%\XmlTool20.vmwcsproj /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1
+
+if "%XMLTOOL_BUILD%" == "DONE" goto XMLTOOLSKIP
+
+msbuild %XML_TOOL_PATH%\XmlTool20.csproj /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1
+
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
 
+goto XMLTOOLREADY
+
+:XMLTOOLSKIP
+echo Skipping XmlToll build...
+
+:XMLTOOLREADY
+set XMLTOOL_BUILD=DONE
+
 copy %XML_TOOL_PATH%\bin\%PROJECT_CONFIGURATION%\xmltool.exe .
 copy %XML_TOOL_PATH%\nunit_transform.xslt .