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=c641d3934647ee612ed990a00ae170b46e33dc29;hpb=cd68a6ad3c09104b55bb9dea564fc14d28f17454;p=mono.git

diff --git a/mcs/class/System.Web/run-mono-tests.bat b/mcs/class/System.Web/run-mono-tests.bat
index c641d393464..d224c86b6aa 100755
--- a/mcs/class/System.Web/run-mono-tests.bat
+++ b/mcs/class/System.Web/run-mono-tests.bat
@@ -96,6 +96,7 @@ 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\* .
@@ -159,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
 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 ********************************************************