* XmlSchemaExporter.cs: Introduce XmlSchemaObjectContainer class to

[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 579f8d6ea830b394dd16a7bcb7bb86d87b3019b7..9bdf0d7049b5a951d9d127320179a6409b96e556 100644 (file)
--- a/mcs/class/System.XML/run-W3C-tests.bat
+++ b/mcs/class/System.XML/run-W3C-tests.bat
@@ -40,20 +40,28 @@ set CLASSPATH="%RUNTIME_CLASSPATH%;%NUNIT_CLASSPATH%"
 \r
 set W3C_DIR=Test\System.Xml\W3C\\r
 \r
+pushd %W3C_DIR%\r
+\r
 REM ********************************************************\r
-@echo Building GH solution...\r
+@echo Building NUnit solution...\r
 REM ********************************************************\r
 \r
-pushd %W3C_DIR%\r
-devenv W3c.sln /%BUILD_OPTION% Debug_Java >>build.log.txt 2<&1\r
-\r
+devenv %NUNIT_PATH%nunit.java.sln /%BUILD_OPTION% Debug_Java >build.log.txt 2<&1\r
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
 \r
 REM ********************************************************\r
-@echo Building NUnit solution...\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
+IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
+copy %XML_TOOL_PATH%\bin\Debug_Java\xmltool.exe ..\..\..\r
+copy %XML_TOOL_PATH%\nunit_transform.xslt ..\..\..\r
 \r
-devenv %NUNIT_PATH%nunit.java.sln /%BUILD_OPTION% Debug_Java >>%build.log.txt 2<&1\r
+REM ********************************************************\r
+@echo Building GH solution...\r
+REM ********************************************************\r
+devenv W3c.sln /%BUILD_OPTION% Debug_Java >>build.log.txt 2<&1\r
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
 \r
 REM ********************************************************\r
@@ -80,17 +88,6 @@ popd
 \r
 copy %W3C_DIR%\%GH_OUTPUT_XML% .\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
-\r
-IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
-\r
-copy %XML_TOOL_PATH%\bin\Debug_Java\xmltool.exe .\r
-copy %XML_TOOL_PATH%\nunit_transform.xslt .\r
-\r
 REM ********************************************************\r
 @echo Analyze and print results\r
 REM ********************************************************\r
@@ -106,10 +103,12 @@ GOTO END
 GOTO END\r
 \r
 :BUILD_EXCEPTION\r
+popd\r
 @echo Error in building solutions. See build.log.txt for details...\r
 GOTO END\r
 \r
 :RUN_EXCEPTION\r
+popd\r
 @echo Error in running fixture. See run.log.txt for details...\r
 GOTO END\r
 \r