fixes for tests for java

svn path=/branches/mainsoft/gh1.7/mcs/; revision=58950

diff --git a/mcs/class/System.XML/ChangeLog b/mcs/class/System.XML/ChangeLog
index 8b8ee1fd839de7eba723341f4ec4c21d2f769f35..87676d7f1755d1053be82b51bf14865cdbe0dff2 100644 (file)
--- a/mcs/class/System.XML/ChangeLog
+++ b/mcs/class/System.XML/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-03  Andrew Skiba <andrews@mainsoft.com>
+       
+       * run-tests.bat, run-W3C-tests.bat: fix TARGET_JVM test scripts
+
 2006-04-03  Andrew Skiba <andrews@mainsoft.com>
 
        * run-tests.bat, run-W3C-tests.bat, run-XSLT-tests.bat: batch files

diff --git a/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/ChangeLog b/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/ChangeLog
index 6a4251c9d884d02b36532bfa916763c8b906e393..e0888a5a63c6308515ba9b800be5bbe66b7409dd 100644 (file)
--- a/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/ChangeLog
+++ b/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-03  Andrew Skiba <andrews@mainsoft.com>
+       
+       * xslt.vmwcsproj, xslt.sln: use project reference for nunit
+
 2006-04-03  Andrew Skiba <andrews@mainsoft.com>
 
        * xslt.vmwcsproj : refer nunit from mono tree

diff --git a/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt.sln b/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt.sln
index 5b8e99c95e55edc082c9401802eaae10826e68ae..338c1908d96d64351d00b8628077c18e2d8a5218 100755 (executable)
--- a/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt.sln
+++ b/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\r
        EndProjectSection\r
 EndProject\r
+Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "nunit.framework.dll.J2EE", "..\..\..\..\..\nunit20\framework\nunit.framework.dll.J2EE.vmwcsproj", "{39CC8FF7-EF1A-41A1-B727-42684211ECD1}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+       EndProjectSection\r
+EndProject\r
+Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "nunit.core.dll.J2EE", "..\..\..\..\..\nunit20\core\nunit.core.dll.J2EE.vmwcsproj", "{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+       EndProjectSection\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfiguration) = preSolution\r
                Debug = Debug\r
@@ -22,6 +30,26 @@ Global
                {7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Release.Build.0 = Release_Java|.NET\r
                {7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Release_Java.ActiveCfg = Release_Java|.NET\r
                {7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Release_Java.Build.0 = Release_Java|.NET\r
+               {39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug.ActiveCfg = Debug|.NET\r
+               {39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug.Build.0 = Debug|.NET\r
+               {39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug_Java.ActiveCfg = Debug_Java|.NET\r
+               {39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug_Java.Build.0 = Debug_Java|.NET\r
+               {39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug-Strong.ActiveCfg = Debug|.NET\r
+               {39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug-Strong.Build.0 = Debug|.NET\r
+               {39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release.ActiveCfg = Release_Java|.NET\r
+               {39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release.Build.0 = Release_Java|.NET\r
+               {39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release_Java.ActiveCfg = Release_Java|.NET\r
+               {39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release_Java.Build.0 = Release_Java|.NET\r
+               {7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug.ActiveCfg = Debug|.NET\r
+               {7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug.Build.0 = Debug|.NET\r
+               {7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug_Java.ActiveCfg = Debug_Java|.NET\r
+               {7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug_Java.Build.0 = Debug_Java|.NET\r
+               {7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug-Strong.ActiveCfg = Debug|.NET\r
+               {7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug-Strong.Build.0 = Debug|.NET\r
+               {7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Release.ActiveCfg = Release_Java|.NET\r
+               {7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Release.Build.0 = Release_Java|.NET\r
+               {7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Release_Java.ActiveCfg = Release_Java|.NET\r
+               {7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Release_Java.Build.0 = Release_Java|.NET\r
        EndGlobalSection\r
        GlobalSection(ExtensibilityGlobals) = postSolution\r
        EndGlobalSection\r

diff --git a/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt.vmwcsproj b/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt.vmwcsproj
index d8055b18e1a0cfafc1632d8f541653343cb769ec..0fcdc166c87c1a07dbddcb65925bb61aa4c1531b 100755 (executable)
--- a/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt.vmwcsproj
+++ b/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt.vmwcsproj
@@ -8,10 +8,10 @@
                        </Settings>\r
                        <References>\r
                                <Reference Name="System" AssemblyName="System" HintPath="..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"/>\r
-                               <Reference Name="rt" AssemblyName="rt" HintPath="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\j2sdk1.4\rt.dll" Private="False"/>\r
                                <Reference Name="System.Xml" AssemblyName="System.Xml" HintPath="..\..\..\bin\Debug\System.Xml.dll"/>\r
-                               <Reference Name="nunit.core" AssemblyName="nunit.core" HintPath="..\..\..\..\..\nunit20\core\bin\Debug_Java\nunit.core.dll" Private="True"/>\r
-                               <Reference Name="nunit.framework" AssemblyName="nunit.framework" HintPath="..\..\..\..\..\nunit20\framework\bin\Debug_Java\nunit.framework.dll" Private="True"/>\r
+                               <Reference Name="rt" AssemblyName="rt" HintPath="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\jre5\rt.dll" Private="False"/>\r
+                               <Reference Name="nunit.core.dll.J2EE" Project="{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}" Package="{83B010C7-76FC-4FAD-A26C-00D7EFE60256}"/>\r
+                               <Reference Name="nunit.framework.dll.J2EE" Project="{39CC8FF7-EF1A-41A1-B727-42684211ECD1}" Package="{83B010C7-76FC-4FAD-A26C-00D7EFE60256}"/>\r
                        </References>\r
                </Build>\r
                <Files>\r
@@ -21,6 +21,6 @@
                                <File RelPath="XsltTestUtils.cs" SubType="Code" BuildAction="Compile"/>\r
                        </Include>\r
                </Files>\r
-               <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"/>\r
+               <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"/>\r
        </CSHARP>\r
-       <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>\r
+       <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>\r

diff --git a/mcs/class/System.XML/Test/System.Xml/W3C/ChangeLog b/mcs/class/System.XML/Test/System.Xml/W3C/ChangeLog
index 5b4ab9c1d1facb5e5764aaae7289b5876f0a4ae5..a7f5e642f467caac8668741949f94a1d8b2373f8 100644 (file)
--- a/mcs/class/System.XML/Test/System.Xml/W3C/ChangeLog
+++ b/mcs/class/System.XML/Test/System.Xml/W3C/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-03  Andrew Skiba  <andrews@mainsoft.com>
+
+       * W3C.vmwcsproj, W3C.sln: use project reference for nunit
+
 2006-04-03  Andrew Skiba  <andrews@mainsoft.com>
 
        * W3C.vmwcsproj : use nunit from mono tree

diff --git a/mcs/class/System.XML/Test/System.Xml/W3C/W3C.sln b/mcs/class/System.XML/Test/System.Xml/W3C/W3C.sln
index 943a283ff10491b36dd09fe4ca5c25ac33c688e6..19441fa60e67a59859565d70ebcec1eec8c532ad 100644 (file)
--- a/mcs/class/System.XML/Test/System.Xml/W3C/W3C.sln
+++ b/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\r
        EndProjectSection\r
 EndProject\r
+Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "nunit.framework.dll.J2EE", "..\..\..\..\..\nunit20\framework\nunit.framework.dll.J2EE.vmwcsproj", "{39CC8FF7-EF1A-41A1-B727-42684211ECD1}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+       EndProjectSection\r
+EndProject\r
+Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "nunit.core.dll.J2EE", "..\..\..\..\..\nunit20\core\nunit.core.dll.J2EE.vmwcsproj", "{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+       EndProjectSection\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfiguration) = preSolution\r
+               Debug = Debug\r
                Debug_Java = Debug_Java\r
                Release_Java = Release_Java\r
        EndGlobalSection\r
        GlobalSection(ProjectConfiguration) = postSolution\r
+               {7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug.ActiveCfg = Debug_Java|.NET\r
+               {7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug.Build.0 = Debug_Java|.NET\r
                {7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug_Java.ActiveCfg = Debug_Java|.NET\r
                {7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Debug_Java.Build.0 = Debug_Java|.NET\r
                {7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Release_Java.ActiveCfg = Release_Java|.NET\r
                {7D5A1B1C-4B8C-462B-86C8-0961A838A39D}.Release_Java.Build.0 = Release_Java|.NET\r
+               {39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug.ActiveCfg = Debug|.NET\r
+               {39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug.Build.0 = Debug|.NET\r
+               {39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug_Java.ActiveCfg = Debug_Java|.NET\r
+               {39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Debug_Java.Build.0 = Debug_Java|.NET\r
+               {39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release_Java.ActiveCfg = Release_Java|.NET\r
+               {39CC8FF7-EF1A-41A1-B727-42684211ECD1}.Release_Java.Build.0 = Release_Java|.NET\r
+               {7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug.ActiveCfg = Debug|.NET\r
+               {7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug.Build.0 = Debug|.NET\r
+               {7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug_Java.ActiveCfg = Debug_Java|.NET\r
+               {7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Debug_Java.Build.0 = Debug_Java|.NET\r
+               {7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Release_Java.ActiveCfg = Release_Java|.NET\r
+               {7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}.Release_Java.Build.0 = Release_Java|.NET\r
        EndGlobalSection\r
        GlobalSection(ExtensibilityGlobals) = postSolution\r
        EndGlobalSection\r

diff --git a/mcs/class/System.XML/Test/System.Xml/W3C/W3C.vmwcsproj b/mcs/class/System.XML/Test/System.Xml/W3C/W3C.vmwcsproj
index 1a75d92e5b2fe24e756f3eef099755ce9845a8b4..2ad00eb14e2ca9d8a1859a0a6cbd8addee166d72 100644 (file)
--- a/mcs/class/System.XML/Test/System.Xml/W3C/W3C.vmwcsproj
+++ b/mcs/class/System.XML/Test/System.Xml/W3C/W3C.vmwcsproj
@@ -8,9 +8,9 @@
                        <References>\r
                                <Reference Name="System" AssemblyName="System" HintPath="..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"/>\r
                                <Reference Name="System.Xml" AssemblyName="System.Xml" HintPath="..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Xml.dll"/>\r
-                               <Reference Name="rt" AssemblyName="rt" HintPath="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\j2sdk1.4\rt.dll" Private="False"/>\r
-                               <Reference Name="nunit.framework" AssemblyName="nunit.framework" HintPath="..\..\..\..\..\nunit20\framework\bin\Debug_Java\nunit.framework.dll" Private="True"/>\r
-                               <Reference Name="nunit.core" AssemblyName="nunit.core" HintPath="..\..\..\..\..\nunit20\core\bin\Debug_Java\nunit.core.dll" Private="True"/>\r
+                               <Reference Name="rt" AssemblyName="rt" HintPath="..\..\..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\jre5\rt.dll" Private="False"/>\r
+                               <Reference Name="nunit.framework.dll.J2EE" Project="{39CC8FF7-EF1A-41A1-B727-42684211ECD1}" Package="{83B010C7-76FC-4FAD-A26C-00D7EFE60256}"/>\r
+                               <Reference Name="nunit.core.dll.J2EE" Project="{7C52A6A5-71ED-4468-9564-2FF5CD6E6E6C}" Package="{83B010C7-76FC-4FAD-A26C-00D7EFE60256}"/>\r
                        </References>\r
                </Build>\r
                <Files>\r
@@ -18,6 +18,6 @@
                                <File RelPath="xmlconf.cs" SubType="Code" BuildAction="Compile"/>\r
                        </Include>\r
                </Files>\r
-               <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"/>\r
+               <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"/>\r
        </CSHARP>\r
-       <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>\r
+       <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>\r

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

diff --git a/mcs/class/System.XML/run-XSLT-tests.bat b/mcs/class/System.XML/run-XSLT-tests.bat
index bb4d2c9ba99af7751b5153cdf63fc853060beec2..ecde83518ad4e43066e60faa2353ab1fe04e2c12 100644 (file)
--- a/mcs/class/System.XML/run-XSLT-tests.bat
+++ b/mcs/class/System.XML/run-XSLT-tests.bat
@@ -55,6 +55,9 @@ REM ********************************************************
 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
 \r
 REM ********************************************************\r
 @echo Building GH solution...\r
@@ -93,9 +96,6 @@ popd
 \r
 copy %XSLT_DIR%\%GH_OUTPUT_XML% .\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