2007-04-17 Atsushi Enomoto <atsushi@ximian.com>

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

diff --git a/mcs/class/System.Configuration/run-tests.test.bat b/mcs/class/System.Configuration/run-tests.test.bat
index 3983971545ce5ca9911f5ffeb81d0a64f460e902..c2489825c6e528ea20340e24e5a215e61edf2210 100644 (file)
--- a/mcs/class/System.Configuration/run-tests.test.bat
+++ b/mcs/class/System.Configuration/run-tests.test.bat
@@ -52,8 +52,8 @@ 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 JAVA_HOME=%VMW_HOME%\jre
 
 set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar
 set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.jar
@@ -119,19 +119,30 @@ REM ********************************************************
 
 copy %BACK_TO_ROOT_DIR%Test\bin\%PROJECT_CONFIGURATION%\%TEST_ASSEMBLY% .
 
-REM @echo on
+@echo on
 "%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi %TEST_ASSEMBLY% /fixture=%RUNNING_FIXTURE%  %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML% >>%RUN_LOG% 2<&1
-REM @echo off
+@echo off
 
 REM ********************************************************
 @echo Build XmlTool
 REM ********************************************************
 set XML_TOOL_PATH=..\..\tools\mono-xmltool
+
+if "%XMLTOOL_BUILD%" == "DONE" goto XMLTOOLSKIP
+
 REM devenv %XML_TOOL_PATH%\XmlTool.sln /%BUILD_OPTION% %PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1
-msbuild %XML_TOOL_PATH%\XmlTool20.vmwcsproj /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1
+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 .