merge java tests stuff from mainsoft.1.7 branch

svn path=/trunk/mcs/; revision=58951

mcs/class/System.XML/ChangeLog

@@ -1,3 +1,7 @@
+2006-04-03  Andrew Skiba <[email protected]>
+	
+	* run-tests.bat, run-W3C-tests.bat: fix TARGET_JVM test scripts
+
 2006-04-03  Andrew Skiba <[email protected]>
 
 	* run-tests.bat, run-W3C-tests.bat, run-XSLT-tests.bat: batch files

mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/ChangeLog

@@ -1,3 +1,7 @@
+2006-04-03  Andrew Skiba <[email protected]>
+	
+	* xslt.vmwcsproj, xslt.sln: use project reference for nunit
+
 2006-04-03  Andrew Skiba <[email protected]>
 
 	* xslt.vmwcsproj : refer nunit from mono tree

mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt.sln

@@ -3,6 +3,14 @@ Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "xslt", "xslt.vmwcsproj", "{
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
+Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "nunit.framework.dll.J2EE", "..\..\..\..\..\nunit20\framework\nunit.framework.dll.J2EE.vmwcsproj", "{39CC8FF7-EF1A-41A1-B727-42684211ECD1}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "nunit.core.dll.J2EE", "..\..\..\..\..\nunit20\core\nunit.core.dll.J2EE.vmwcsproj", "{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
@@ -22,6 +30,26 @@ Global
 		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Release.Build.0 = Release_Java|.NET
 		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Release_Java.ActiveCfg = Release_Java|.NET
 		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Release_Java.Build.0 = Release_Java|.NET
+		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug.ActiveCfg = Debug|.NET
+		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug.Build.0 = Debug|.NET
+		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug_Java.ActiveCfg = Debug_Java|.NET
+		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug_Java.Build.0 = Debug_Java|.NET
+		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug-Strong.ActiveCfg = Debug|.NET
+		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug-Strong.Build.0 = Debug|.NET
+		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release.ActiveCfg = Release_Java|.NET
+		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release.Build.0 = Release_Java|.NET
+		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release_Java.ActiveCfg = Release_Java|.NET
+		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release_Java.Build.0 = Release_Java|.NET
+		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug.ActiveCfg = Debug|.NET
+		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug.Build.0 = Debug|.NET
+		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug_Java.ActiveCfg = Debug_Java|.NET
+		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug_Java.Build.0 = Debug_Java|.NET
+		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug-Strong.ActiveCfg = Debug|.NET
+		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug-Strong.Build.0 = Debug|.NET
+		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Release.ActiveCfg = Release_Java|.NET
+		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Release.Build.0 = Release_Java|.NET
+		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Release_Java.ActiveCfg = Release_Java|.NET
+		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Release_Java.Build.0 = Release_Java|.NET
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection

mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt.vmwcsproj

@@ -8,10 +8,10 @@
 			</Settings>
 			<References>
 				<Reference Name="System" AssemblyName="System" HintPath="..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"/>
-				<Reference Name="rt" AssemblyName="rt" HintPath="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\j2sdk1.4\rt.dll" Private="False"/>
 				<Reference Name="System.Xml" AssemblyName="System.Xml" HintPath="..\..\..\bin\Debug\System.Xml.dll"/>
-				<Reference Name="nunit.core" AssemblyName="nunit.core" HintPath="..\..\..\..\..\nunit20\core\bin\Debug_Java\nunit.core.dll" Private="True"/>
-				<Reference Name="nunit.framework" AssemblyName="nunit.framework" HintPath="..\..\..\..\..\nunit20\framework\bin\Debug_Java\nunit.framework.dll" Private="True"/>
+				<Reference Name="rt" AssemblyName="rt" HintPath="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\jre5\rt.dll" Private="False"/>
+				<Reference Name="nunit.core.dll.J2EE" Project="{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}" Package="{83B010C7-76FC-4FAD-A26C-00D7EFE60256}"/>
+				<Reference Name="nunit.framework.dll.J2EE" Project="{39CC8FF7-EF1A-41A1-B727-42684211ECD1}" Package="{83B010C7-76FC-4FAD-A26C-00D7EFE60256}"/>
 			</References>
 		</Build>
 		<Files>
@@ -21,6 +21,6 @@
 				<File RelPath="XsltTestUtils.cs" SubType="Code" BuildAction="Compile"/>
 			</Include>
 		</Files>
-		<UserProperties REFS.JarPath.nunit.util="..\..\..\..\..\..\..\..\views\DevQA\studio\GH\DevQA\tests\utils\nunit\nunit-2.2.0\nunit-console\bin\Debug_Java\nunit.util.jar" REFS.JarPath.nunit.framework="..\..\..\..\..\..\..\..\views\DevQA\studio\GH\DevQA\tests\utils\nunit\nunit-2.2.0\nunit-console\bin\Debug_Java\nunit.framework.jar" REFS.JarPath.nunit.core="..\..\..\..\..\..\..\..\views\DevQA\studio\GH\DevQA\tests\utils\nunit\nunit-2.2.0\nunit-console\bin\Debug_Java\nunit.core.jar" REFS.JarPath.system="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.jar" REFS.JarPath.system.xml="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Xml.jar" REFS.JarPath.rt="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\j2sdk1.4\lib\rt.jar" project.JDKType="1.4.2_05" jarserver="ipa"/>
+		<UserProperties jarserver="ipa" project.JDKType="1.5.0_05" REFS.JarPath.rt="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\j2sdk1.4\lib\rt.jar" REFS.JarPath.system.xml="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Xml.jar" REFS.JarPath.system="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.jar" REFS.JarPath.nunit.core="..\..\..\..\..\..\..\..\views\DevQA\studio\GH\DevQA\tests\utils\nunit\nunit-2.2.0\nunit-console\bin\Debug_Java\nunit.core.jar" REFS.JarPath.nunit.framework="..\..\..\..\..\..\..\..\views\DevQA\studio\GH\DevQA\tests\utils\nunit\nunit-2.2.0\nunit-console\bin\Debug_Java\nunit.framework.jar" REFS.JarPath.nunit.util="..\..\..\..\..\..\..\..\views\DevQA\studio\GH\DevQA\tests\utils\nunit\nunit-2.2.0\nunit-console\bin\Debug_Java\nunit.util.jar"/>
 	</CSHARP>
-	<VisualMainWin><Project Prop2023="1.4.2_05" Prop2024="" Prop2026="" Prop2015="" Version="1.7.0" ProjectType="1"/><References/><Configs><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="1" Prop2006=".\nunit-console.jar" Prop2007="" Prop2008="" Prop2009="/fixture:MonoTests.oasis_xslt.SuiteBuilder  /include:Clean" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Debug_Java"/><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Release_Java"/><Config Prop2000="1" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="1" Prop2006=".\nunit-console.exe" Prop2007="" Prop2008="" Prop2009="xslt.dll /fixture:MonoTests.oasis_xslt.SuiteBuilder  /include:Clean" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Debug"/></Configs></VisualMainWin></VisualStudioProject>
+	<VisualMainWin><Project Prop2023="1.5.0_05" Prop2024="" Prop2026="" Prop2015="" Version="1.7.0" ProjectType="1"/><References/><Configs><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="1" Prop2006=".\nunit-console.jar" Prop2007="" Prop2008="" Prop2009="/fixture:MonoTests.oasis_xslt.SuiteBuilder  /include:Clean" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Debug_Java"/><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Release_Java"/><Config Prop2000="1" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="1" Prop2006=".\nunit-console.exe" Prop2007="" Prop2008="" Prop2009="xslt.dll /fixture:MonoTests.oasis_xslt.SuiteBuilder  /include:Clean" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Debug"/></Configs></VisualMainWin></VisualStudioProject>

mcs/class/System.XML/Test/System.Xml/W3C/ChangeLog

@@ -1,3 +1,7 @@
+2006-04-03  Andrew Skiba  <[email protected]>
+
+	* W3C.vmwcsproj, W3C.sln: use project reference for nunit
+
 2006-04-03  Andrew Skiba  <[email protected]>
 
 	* W3C.vmwcsproj : use nunit from mono tree

mcs/class/System.XML/Test/System.Xml/W3C/W3C.sln

@@ -3,16 +3,39 @@ Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "W3C", "W3C.vmwcsproj", "{7D
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
+Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "nunit.framework.dll.J2EE", "..\..\..\..\..\nunit20\framework\nunit.framework.dll.J2EE.vmwcsproj", "{39CC8FF7-EF1A-41A1-B727-42684211ECD1}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "nunit.core.dll.J2EE", "..\..\..\..\..\nunit20\core\nunit.core.dll.J2EE.vmwcsproj", "{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
 		Debug_Java = Debug_Java
 		Release_Java = Release_Java
 	EndGlobalSection
 	GlobalSection(ProjectConfiguration) = postSolution
+		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug.ActiveCfg = Debug_Java|.NET
+		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug.Build.0 = Debug_Java|.NET
 		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug_Java.ActiveCfg = Debug_Java|.NET
 		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug_Java.Build.0 = Debug_Java|.NET
 		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Release_Java.ActiveCfg = Release_Java|.NET
 		{7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Release_Java.Build.0 = Release_Java|.NET
+		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug.ActiveCfg = Debug|.NET
+		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug.Build.0 = Debug|.NET
+		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug_Java.ActiveCfg = Debug_Java|.NET
+		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug_Java.Build.0 = Debug_Java|.NET
+		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release_Java.ActiveCfg = Release_Java|.NET
+		{39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release_Java.Build.0 = Release_Java|.NET
+		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug.ActiveCfg = Debug|.NET
+		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug.Build.0 = Debug|.NET
+		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug_Java.ActiveCfg = Debug_Java|.NET
+		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug_Java.Build.0 = Debug_Java|.NET
+		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Release_Java.ActiveCfg = Release_Java|.NET
+		{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Release_Java.Build.0 = Release_Java|.NET
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection

mcs/class/System.XML/Test/System.Xml/W3C/W3C.vmwcsproj

@@ -8,9 +8,9 @@
 			<References>
 				<Reference Name="System" AssemblyName="System" HintPath="..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"/>
 				<Reference Name="System.Xml" AssemblyName="System.Xml" HintPath="..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Xml.dll"/>
-				<Reference Name="rt" AssemblyName="rt" HintPath="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\j2sdk1.4\rt.dll" Private="False"/>
-				<Reference Name="nunit.framework" AssemblyName="nunit.framework" HintPath="..\..\..\..\..\nunit20\framework\bin\Debug_Java\nunit.framework.dll" Private="True"/>
-				<Reference Name="nunit.core" AssemblyName="nunit.core" HintPath="..\..\..\..\..\nunit20\core\bin\Debug_Java\nunit.core.dll" Private="True"/>
+				<Reference Name="rt" AssemblyName="rt" HintPath="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\jre5\rt.dll" Private="False"/>
+				<Reference Name="nunit.framework.dll.J2EE" Project="{39CC8FF7-EF1A-41A1-B727-42684211ECD1}" Package="{83B010C7-76FC-4FAD-A26C-00D7EFE60256}"/>
+				<Reference Name="nunit.core.dll.J2EE" Project="{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}" Package="{83B010C7-76FC-4FAD-A26C-00D7EFE60256}"/>
 			</References>
 		</Build>
 		<Files>
@@ -18,6 +18,6 @@
 				<File RelPath="xmlconf.cs" SubType="Code" BuildAction="Compile"/>
 			</Include>
 		</Files>
-		<UserProperties REFS.JarPath.nunit.util="..\..\..\..\..\..\..\..\views\DevQA\studio\GH\DevQA\tests\utils\nunit\nunit-2.2.0\nunit-console\bin\Debug_Java\nunit.util.jar" REFS.JarPath.nunit.framework="..\..\..\..\..\..\..\..\views\DevQA\studio\GH\DevQA\tests\utils\nunit\nunit-2.2.0\nunit-console\bin\Debug_Java\nunit.framework.jar" REFS.JarPath.nunit.core="..\..\..\..\..\..\..\..\views\DevQA\studio\GH\DevQA\tests\utils\nunit\nunit-2.2.0\nunit-console\bin\Debug_Java\nunit.core.jar" REFS.JarPath.system="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.jar" REFS.JarPath.system.data="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Data.jar" REFS.JarPath.system.xml="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Xml.jar" REFS.JarPath.rt="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\j2sdk1.4\lib\rt.jar" project.JDKType="1.4.2_05" jarserver="ipa"/>
+		<UserProperties jarserver="ipa" project.JDKType="1.5.0_05" REFS.JarPath.rt="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\j2sdk1.4\lib\rt.jar" REFS.JarPath.system.xml="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Xml.jar" REFS.JarPath.system.data="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Data.jar" REFS.JarPath.system="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.jar" REFS.JarPath.nunit.core="..\..\..\..\..\..\..\..\views\DevQA\studio\GH\DevQA\tests\utils\nunit\nunit-2.2.0\nunit-console\bin\Debug_Java\nunit.core.jar" REFS.JarPath.nunit.framework="..\..\..\..\..\..\..\..\views\DevQA\studio\GH\DevQA\tests\utils\nunit\nunit-2.2.0\nunit-console\bin\Debug_Java\nunit.framework.jar" REFS.JarPath.nunit.util="..\..\..\..\..\..\..\..\views\DevQA\studio\GH\DevQA\tests\utils\nunit\nunit-2.2.0\nunit-console\bin\Debug_Java\nunit.util.jar"/>
 	</CSHARP>
-	<VisualMainWin><Project Prop2023="1.4.2_05" Prop2024="" Prop2026="" Prop2015="" Version="1.7.0" ProjectType="1"/><References/><Configs><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="1" Prop2006="C:\cygwin\monobuild\mcs\class\System.XML\Test\System.Xml\W3C\nunit-console.jar" Prop2007="" Prop2008="" Prop2009="/fixture:MonoTests.W3C_xmlconf.CleanTests /xml=TestsResult.xml" Prop2010="C:\cygwin\monobuild\mcs\class\System.XML\Test\System.Xml\W3C" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Debug_Java"/><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Release_Java"/></Configs></VisualMainWin></VisualStudioProject>
+	<VisualMainWin><Project Prop2023="1.5.0_05" Prop2024="" Prop2026="" Prop2015="" Version="1.7.0" ProjectType="1"/><References/><Configs><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="1" Prop2006="C:\cygwin\monobuild\mcs\class\System.XML\Test\System.Xml\W3C\nunit-console.jar" Prop2007="" Prop2008="" Prop2009="/fixture:MonoTests.W3C_xmlconf.CleanTests /xml=TestsResult.xml" Prop2010="C:\cygwin\monobuild\mcs\class\System.XML\Test\System.Xml\W3C" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Debug_Java"/><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0" Name="Release_Java"/></Configs></VisualMainWin></VisualStudioProject>

mcs/class/System.XML/run-W3C-tests.bat

@@ -40,20 +40,28 @@ set CLASSPATH="%RUNTIME_CLASSPATH%;%NUNIT_CLASSPATH%"
 
 set W3C_DIR=Test\System.Xml\W3C\
 
+pushd %W3C_DIR%
+
 REM ********************************************************
-@echo Building GH solution...
+@echo Building NUnit solution...
 REM ********************************************************
 
-pushd %W3C_DIR%
-devenv W3c.sln /%BUILD_OPTION% Debug_Java >>build.log.txt 2<&1
-
+devenv %NUNIT_PATH%nunit.java.sln /%BUILD_OPTION% Debug_Java >build.log.txt 2<&1
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
 
 REM ********************************************************
-@echo Building NUnit solution...
+@echo Build XmlTool
 REM ********************************************************
+set XML_TOOL_PATH=..\..\..\..\..\tools\mono-xmltool
+devenv %XML_TOOL_PATH%\XmlTool.sln /%BUILD_OPTION% Debug_Java >>build.log.txt 2<&1
+IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
+copy %XML_TOOL_PATH%\bin\Debug_Java\xmltool.exe ..\..\..
+copy %XML_TOOL_PATH%\nunit_transform.xslt ..\..\..
 
-devenv %NUNIT_PATH%nunit.java.sln /%BUILD_OPTION% Debug_Java >>%build.log.txt 2<&1
+REM ********************************************************
+@echo Building GH solution...
+REM ********************************************************
+devenv W3c.sln /%BUILD_OPTION% Debug_Java >>build.log.txt 2<&1
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
 
 REM ********************************************************
@@ -80,17 +88,6 @@ popd
 
 copy %W3C_DIR%\%GH_OUTPUT_XML% .
 
-REM ********************************************************
-@echo Build XmlTool
-REM ********************************************************
-set XML_TOOL_PATH=..\..\tools\mono-xmltool
-devenv %XML_TOOL_PATH%\XmlTool.sln /%BUILD_OPTION% Debug_Java >>build.log.txt 2<&1
-
-IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
-
-copy %XML_TOOL_PATH%\bin\Debug_Java\xmltool.exe .
-copy %XML_TOOL_PATH%\nunit_transform.xslt .
-
 REM ********************************************************
 @echo Analyze and print results
 REM ********************************************************
@@ -106,10 +103,12 @@ GOTO END
 GOTO END
 
 :BUILD_EXCEPTION
+popd
 @echo Error in building solutions. See build.log.txt for details...
 GOTO END
 
 :RUN_EXCEPTION
+popd
 @echo Error in running fixture. See run.log.txt for details...
 GOTO END
 

mcs/class/System.XML/run-XSLT-tests.bat

@@ -55,6 +55,9 @@ REM ********************************************************
 set XML_TOOL_PATH=..\..\..\..\..\tools\mono-xmltool
 devenv %XML_TOOL_PATH%\XmlTool.sln /%BUILD_OPTION% Debug_Java >>build.log.txt 2<&1
 IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
+copy %XML_TOOL_PATH%\bin\Debug_Java\xmltool.exe ..\..\..
+copy %XML_TOOL_PATH%\nunit_transform.xslt ..\..\..
+
 
 REM ********************************************************
 @echo Building GH solution...
@@ -93,9 +96,6 @@ popd
 
 copy %XSLT_DIR%\%GH_OUTPUT_XML% .
 
-copy %XML_TOOL_PATH%\bin\Debug_Java\xmltool.exe .
-copy %XML_TOOL_PATH%\nunit_transform.xslt .
-
 REM ********************************************************
 @echo Analyze and print results
 REM ********************************************************