2006-09-05 Lluis Sanchez Gual <lluis@novell.com>

[mono.git] / mcs / class / System.XML / run-W3C-tests.bat

diff --git a/mcs/class/System.XML/run-W3C-tests.bat b/mcs/class/System.XML/run-W3C-tests.bat
index 0b2b7858f4fa4efce5a5c5144d0d54aaad68b4b5..25c979b056b2473e4b271b97e1aaede988df708b 100644 (file)
--- a/mcs/class/System.XML/run-W3C-tests.bat
+++ b/mcs/class/System.XML/run-W3C-tests.bat
@@ -1,4 +1,4 @@
-@echo off\r
+rem @echo off\r
 REM ********************************************************\r
 REM This batch file receives the follwing parameters:\r
 REM build/rebuild (optional): should the solution file be rebuilded \r
@@ -10,6 +10,7 @@ REM ********************************************************
 IF "%JAVA_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION\r
 \r
 IF "%GH_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION\r
+IF "%GHROOT%"=="" set GHROOT=%GH_HOME%\r
 \r
 REM ********************************************************\r
 REM Set parameters\r
@@ -28,16 +29,13 @@ REM @echo Set environment
 REM ********************************************************\r
 \r
 set JGAC_PATH=%GH_HOME%\jgac\vmw4j2ee_110\\r
-\r
 set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar;%JGAC_PATH%System.jar;%JGAC_PATH%System.Xml.jar;%JGAC_PATH%J2SE.Helpers.jar;\r
 set NUNIT_OPTIONS=/fixture=MonoTests.W3C_xmlconf.CleanTests\r
-\r
+set PROJECT_CONFIGURATION=Debug_Java20\r
 set GH_OUTPUT_XML=W3C_nunit_results.xml\r
-\r
-set NUNIT_PATH=..\..\..\..\..\nunit20\\r
-set NUNIT_CLASSPATH=%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit.framework.jar;%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit.util.jar;%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit.core.jar;%NUNIT_PATH%nunit-console\bin\Debug_Java\nunit-console.jar\r
+set NUNIT_PATH=..\..\..\..\..\nunit20\r
+set NUNIT_CLASSPATH=%NUNIT_PATH%\nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.framework.jar;%NUNIT_PATH%\nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.util.jar;%NUNIT_PATH%\nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.core.jar;%NUNIT_PATH%\nunit-console\bin\%PROJECT_CONFIGURATION%\nunit-console.jar\r
 set CLASSPATH="%RUNTIME_CLASSPATH%;%NUNIT_CLASSPATH%"\r
-\r
 set W3C_DIR=Test\System.Xml\W3C\\r
 \r
 pushd %W3C_DIR%\r
@@ -47,37 +45,37 @@ REM ********************************************************
 REM ********************************************************\r
 \r
 if "%NUNIT_BUILD%" == "DONE" goto NUNITSKIP\r
-devenv %NUNIT_PATH%nunit.java.sln /%BUILD_OPTION% Debug_Java >build.log.txt 2<&1\r
+msbuild %NUNIT_PATH%\nunit20.java.sln /t:%BUILD_OPTION% /p:configuration=%PROJECT_CONFIGURATION% >build.log.txt 2<&1\r
+\r
+IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
 \r
-goto NUNITREADY\r
+set NUNIT_BUILD=DONE\r
 \r
 :NUNITSKIP\r
 echo Skipping NUnit Build...\r
 \r
-:NUNITREADY\r
-set NUNIT_BUILD=DONE\r
 \r
-IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
 \r
 REM ********************************************************\r
 @echo Build XmlTool\r
 REM ********************************************************\r
 set XML_TOOL_PATH=..\..\..\..\..\tools\mono-xmltool\r
-devenv %XML_TOOL_PATH%\XmlTool.sln /%BUILD_OPTION% Debug_Java >>build.log.txt 2<&1\r
+msbuild %XML_TOOL_PATH%\XmlTool20.sln /p:configuration=Debug >>build.log.txt 2<&1\r
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
-copy %XML_TOOL_PATH%\bin\Debug_Java\xmltool.exe ..\..\..\r
+copy %XML_TOOL_PATH%\bin\Debug\xmltool20.exe ..\..\..\r
 copy %XML_TOOL_PATH%\nunit_transform.xslt ..\..\..\r
 \r
 REM ********************************************************\r
 @echo Building GH solution...\r
 REM ********************************************************\r
-devenv W3c.sln /%BUILD_OPTION% Debug_Java >>build.log.txt 2<&1\r
+del W3C.jar\r
+msbuild W3c20.J2EE.sln /t:%BUILD_OPTION% /p:configuration=%PROJECT_CONFIGURATION% >>build.log.txt 2<&1\r
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
 \r
 REM ********************************************************\r
 @echo Building test catalog...\r
 REM ********************************************************\r
-\r
+del xmlts20031210.zip\r
 wget http://www.w3.org/XML/Test/xmlts20031210.zip\r
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
 \r
@@ -89,9 +87,8 @@ IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
 REM ********************************************************\r
 @echo Running GH tests...\r
 REM ********************************************************\r
-\r
 @echo on\r
-"%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi W3C.jar  %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML%  >run.log.txt 2<&1\r
+"%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi W3C.jar %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML%  >run.log.txt 2<&1\r
 @echo off\r
 \r
 popd\r