Fix bug #703910 - implement Order support in XmlSerializer.

[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..dc36393b6c0a88ea8f556c8372fa7ff4d9637dcb 100644 (file)
--- a/mcs/class/System.XML/run-W3C-tests.bat
+++ b/mcs/class/System.XML/run-W3C-tests.bat
@@ -7,47 +7,104 @@ REM example run-tests build
 REM will cause to build (and not rebuild) test solutions,\r
 REM ********************************************************\r
 \r
-IF "%JAVA_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION\r
+IF "%1"=="" GOTO USAGE\r
+\r
+IF "%VMW_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION\r
 \r
-IF "%GH_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION\r
 \r
-REM ********************************************************\r
-REM Set parameters\r
-REM ********************************************************\r
 \r
 IF "%1"=="" (\r
        set BUILD_OPTION=rebuild\r
 ) ELSE (\r
        set BUILD_OPTION=%1\r
 )\r
-set OUTPUT_FILE_PREFIX=GH_TEST\r
+\r
+REM ********************************************************\r
+REM Set parameters\r
+REM ********************************************************\r
+\r
+set BUILD_OPTION=%1\r
+set OUTPUT_FILE_PREFIX=System_XML_W3C\r
+set RUNNING_FIXTURE=MonoTests.W3C_xmlconf.CleanTests\r
+set TEST_SOLUTION=W3c20.J2EE.sln\r
+set TEST_ASSEMBLY=W3C.jar\r
+set PROJECT_CONFIGURATION=Debug_Java20\r
+\r
+\r
+set startDate=%date%\r
+set startTime=%time%\r
+set sdy=%startDate:~10%\r
+set /a sdm=1%startDate:~4,2% - 100\r
+set /a sdd=1%startDate:~7,2% - 100\r
+set /a sth=%startTime:~0,2%\r
+set /a stm=1%startTime:~3,2% - 100\r
+set /a sts=1%startTime:~6,2% - 100\r
+set TIMESTAMP=%sdy%_%sdm%_%sdd%_%sth%_%stm%\r
 \r
 \r
 REM ********************************************************\r
 REM @echo Set environment\r
 REM ********************************************************\r
 \r
-set JGAC_PATH=%GH_HOME%\jgac\vmw4j2ee_110\\r
+set JGAC_PATH=%VMW_HOME%\java_refs\framework\\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
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%System.Xml.jar\r
+set RUNTIME_CLASSPATH=%RUNTIME_CLASSPATH%;%JGAC_PATH%J2SE.Helpers.jar\r
+set NUNIT_OPTIONS=/exclude=NotWorking\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
+if "%GH_VERSION%"=="" (\r
+       set GH_VERSION=0_0_0_0\r
+)\r
 \r
-set GH_OUTPUT_XML=W3C_nunit_results.xml\r
+set COMMON_PREFIX=%TIMESTAMP%_%OUTPUT_FILE_PREFIX%.GH_%GH_VERSION%.1.%USERNAME%\r
+set GH_OUTPUT_XML=%COMMON_PREFIX%.xml\r
+set BUILD_LOG=%COMMON_PREFIX%.build.log\r
+set RUN_LOG=%COMMON_PREFIX%.run.log\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 CLASSPATH="%RUNTIME_CLASSPATH%;%NUNIT_CLASSPATH%"\r
+set NUNIT_CLASSPATH=%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.framework.jar\r
+set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.util.jar\r
+set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.core.jar\r
+set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit-console.jar\r
+set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;.\r
+set NUNIT_CLASSPATH=%NUNIT_CLASSPATH%;%TEST_ASSEMBLY%\r
 \r
-set W3C_DIR=Test\System.Xml\W3C\\r
+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
+REM ********************************************************\r
+del %TEST_ASSEMBLY%\r
+\r
+msbuild %TEST_SOLUTION% /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1\r
+\r
+IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
+\r
+REM ********************************************************\r
+@echo Building test catalog...\r
+REM ********************************************************\r
+del xmlts20031210.zip\r
+wget http://www.w3.org/XML/Test/xmlts20031210.zip\r
+IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
+\r
+mkdir xmlconf\r
+unzip -un xmlts20031210.zip\r
+IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
+\r
 REM ********************************************************\r
 @echo Building NUnit solution...\r
 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
+\r
+\r
+msbuild %NUNIT_PATH%\nunit20.java.sln /t:%BUILD_OPTION% /p:configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1\r
 \r
 goto NUNITREADY\r
 \r
@@ -60,43 +117,43 @@ set NUNIT_BUILD=DONE
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
 \r
 REM ********************************************************\r
-@echo Build XmlTool\r
+@echo Running GH tests...\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
 REM ********************************************************\r
-@echo Building GH solution...\r
+@echo Running fixture "%RUNNING_FIXTURE%"\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 @echo on\r
+"%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\r
+REM @echo off\r
+\r
+popd\r
+\r
+copy %W3C_DIR%\%GH_OUTPUT_XML% .\r
+copy %W3C_DIR%\%RUN_LOG% .\r
 \r
 REM ********************************************************\r
-@echo Building test catalog...\r
+@echo Build XmlTool\r
 REM ********************************************************\r
+set XML_TOOL_PATH=..\..\tools\mono-xmltool\r
 \r
-wget http://www.w3.org/XML/Test/xmlts20031210.zip\r
-IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
+if "%XMLTOOL_BUILD%" == "DONE" goto XMLTOOLSKIP\r
+\r
+msbuild %XML_TOOL_PATH%\XmlTool20.csproj /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%BUILD_LOG% 2<&1\r
 \r
-mkdir xmlconf\r
-unzip -un xmlts20031210.zip\r
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION\r
 \r
+goto XMLTOOLREADY\r
 \r
-REM ********************************************************\r
-@echo Running GH tests...\r
-REM ********************************************************\r
+:XMLTOOLSKIP\r
+echo Skipping XmlToll build...\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
-@echo off\r
-\r
-popd\r
+:XMLTOOLREADY\r
+set XMLTOOL_BUILD=DONE\r
 \r
-copy %W3C_DIR%\%GH_OUTPUT_XML% .\r
+copy %XML_TOOL_PATH%\bin\%PROJECT_CONFIGURATION%\xmltool.exe .\r
+copy %XML_TOOL_PATH%\nunit_transform.xslt .\r
 \r
 REM ********************************************************\r
 @echo Analyze and print results\r
@@ -114,12 +171,21 @@ GOTO END
 \r
 :BUILD_EXCEPTION\r
 popd\r
-@echo Error in building solutions. See build.log.txt for details...\r
+@echo Error in building solutions. See %BUILD_LOG% for details...\r
 GOTO END\r
 \r
 :RUN_EXCEPTION\r
 popd\r
-@echo Error in running fixture. See run.log.txt for details...\r
+@echo Error in running fixture %RUNNING_FIXTURE%. See %RUN_LOG% for details...\r
+GOTO END\r
+\r
+:USAGE\r
+@echo Parameters: "[build|rebuild] <output_file_name_prefix> <test_fixture> <relative_Working_directory> <back_path (..\..\.....) >"\r
 GOTO END\r
 \r
 :END\r
+copy %RUN_LOG% ..\\r
+copy %BUILD_LOG% ..\\r
+copy %GH_OUTPUT_XML% ..\\r
+\r
+REM EXIT 0\r