2007-05-06 Igor Zelmanovich <igorz@mainsoft.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 410919c2011276750b29b4ab450a1e858ccb79c6..d224c86b6aa347e712a758a10737cfb35a037c9a 100755 (executable)
--- a/mcs/class/System.Web/run-mono-tests.bat
+++ b/mcs/class/System.Web/run-mono-tests.bat
@@ -44,9 +44,9 @@ REM ********************************************************
 REM @echo Set environment\r
 REM ********************************************************\r
 \r
-set JGAC_PATH=%VMW_HOME%\jgac\vmw4j2ee_110\\r
+set JGAC_PATH=%VMW_HOME%\java_refs\framework\\r
 set TOMCAT_PATH=%VMW_HOME%\jakarta-tomcat\common\lib\\r
-set JAVA_HOME=%VMW_HOME%\jre6\r
+set JAVA_HOME=%VMW_HOME%\jre\r
 \r
 set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar\r
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.jar\r
@@ -57,10 +57,12 @@ 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 RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%VMW_HOME%\jgac\jdbc\derby.jar\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
 \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
+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 NUNIT_OPTIONS=/exclude=NotWorking\r
@@ -94,6 +96,7 @@ pushd Test\mainsoft\MainsoftWebApp20\
 xcopy /y WizardTest.skin App_Themes\Theme1\\r
 xcopy /y Theme1.skin App_Themes\Theme1\\r
 xcopy /y Theme2.skin App_Themes\Theme2\\r
+xcopy /y ResolveUrl.ascx Folder\\r
 mkdir XXX\r
 for %%i in (*.as*) DO sed "s/CodeFile=/CodeBehind=/" %%i > XXX\%%i\r
 move /Y XXX\* .\r
@@ -157,6 +160,11 @@ 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\r
 REM @echo off\r
 \r
+IF NOT DEFINED VMW_BUILDER GOTO DONT_SHUTDOWN_TOMCAT\r
+set CATALINA_HOME=%VMW_HOME%\jakarta-tomcat\r
+call "%VMW_HOME%\jakarta-tomcat\bin\shutdown.bat"\r
+:DONT_SHUTDOWN_TOMCAT\r
+\r
 REM ********************************************************\r
 @echo Build XmlTool\r
 REM ********************************************************\r