2008-02-25 Marek Habersack <mhabersack@novell.com>

[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 513affbfff2e6f0cff89ed8a2937a0e93d0381ea..30118011c71e1c3295094bea508a32d091cc4c9b 100755 (executable)
--- a/mcs/class/System.Web/run-mono-tests.bat
+++ b/mcs/class/System.Web/run-mono-tests.bat
@@ -46,7 +46,6 @@ REM ********************************************************
 \r
 set JGAC_PATH=%VMW_HOME%\java_refs\framework\\r
 set TOMCAT_PATH=%VMW_HOME%\jakarta-tomcat\common\lib\\r
-set TOMCAT_SHARED_PATH=%VMW_HOME%\jakarta-tomcat\shared\lib\\r
 set JAVA_HOME=%VMW_HOME%\jre\r
 \r
 set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar\r
@@ -58,6 +57,18 @@ set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%Mainsoft.Web.jar
 rem set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.Drawing.jar\r
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%J2SE.Helpers.jar\r
 \r
+set FACES_PATH=%JGAC_PATH%myfaces\\r
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%FACES_PATH%commons-beanutils-1.7.0.jar\r
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%FACES_PATH%commons-codec-1.3.jar\r
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%FACES_PATH%commons-collections-3.1.jar\r
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%FACES_PATH%commons-digester-1.6.jar\r
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%FACES_PATH%commons-el-1.0.jar\r
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%FACES_PATH%commons-lang-2.1.jar\r
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%FACES_PATH%commons-logging-1.0.4.jar\r
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%FACES_PATH%jstl-1.1.0.jar\r
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%FACES_PATH%myfaces-api-1.1.5.jar\r
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%FACES_PATH%myfaces-impl-1.1.5.jar\r
+\r
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%VMW_HOME%\java_refs\jdbc\derby.jar\r
 \r
 rem ./Test/mainsoft/MainsoftWebTest/bin/Debug_Java20/HtmlCompare.jar\r
@@ -66,7 +77,6 @@ set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;Test\mainsoft\NunitWeb\NunitWeb\bin\De
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;Test\mainsoft\MainsoftWebTest\bin\Debug_Java20\HtmlCompare.jar\r
 \r
 set TOMCAT_CLASSPATH=%TOMCAT_PATH%servlet-api.jar\r
-set TOMCAT_CLASSPATH=%TOMCAT_CLASSPATH%;%TOMCAT_SHARED_PATH%myfaces-api-1.1.5.jar\r
 set NUNIT_OPTIONS=/exclude=NotWorking\r
 \r
 if "%GH_VERSION%"=="" (\r
@@ -118,6 +128,8 @@ set CATALINA_HOME=%VMW_HOME%\jakarta-tomcat
 call "%VMW_HOME%\jakarta-tomcat\bin\shutdown.bat"\r
 echo Waiting 5 sec for tomcat to stop....\r
 @ping 127.0.0.1 -n 5 -w 1000 > nul\r
+del /q "%VMW_HOME%\jakarta-tomcat\webapps\MainsoftWebApp20.war"\r
+rmdir /s /q "%VMW_HOME%\jakarta-tomcat\webapps\MainsoftWebApp20"\r
 xcopy /Y Test\mainsoft\MainsoftWebApp20\bin\%PROJECT_CONFIGURATION%\MainsoftWebApp20.war "%VMW_HOME%\jakarta-tomcat\webapps"\r
 call "%VMW_HOME%\jakarta-tomcat\bin\startup.bat"\r
 echo Waiting 5 sec for tomcat to start....\r
@@ -161,7 +173,7 @@ REM ********************************************************
 copy Test\bin\%PROJECT_CONFIGURATION%\%TEST_ASSEMBLY% .\r
 \r
 REM @echo on\r
-"%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi %TEST_ASSEMBLY% %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML% >>%RUN_LOG% 2<&1\r
+"%JAVA_HOME%\bin\java" -Xmx1024M -XX:MaxPermSize=128m -cp %CLASSPATH% NUnit.Console.ConsoleUi %TEST_ASSEMBLY% %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML% >>%RUN_LOG% 2<&1\r
 REM @echo off\r
 \r
 IF NOT DEFINED VMW_BUILDER GOTO DONT_SHUTDOWN_TOMCAT\r