Author: andrews
Date: 2006-04-03 08:28:02 -0400 (Mon, 03 Apr 2006)
New Revision: 58946

Added:
   branches/mainsoft/gh1.7/mcs/class/System.XML/run-W3C-tests.bat
   branches/mainsoft/gh1.7/mcs/class/System.XML/run-XSLT-tests.bat
   branches/mainsoft/gh1.7/mcs/class/System.XML/run-tests.bat
Modified:
   branches/mainsoft/gh1.7/mcs/class/System.XML/ChangeLog
   
branches/mainsoft/gh1.7/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/ChangeLog
   
branches/mainsoft/gh1.7/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt.vmwcsproj
   branches/mainsoft/gh1.7/mcs/class/System.XML/Test/System.Xml/W3C/ChangeLog
   
branches/mainsoft/gh1.7/mcs/class/System.XML/Test/System.Xml/W3C/W3C.vmwcsproj
Log:
merge from trunk revisions 58933, 58935, 58936

Modified: branches/mainsoft/gh1.7/mcs/class/System.XML/ChangeLog
===================================================================
--- branches/mainsoft/gh1.7/mcs/class/System.XML/ChangeLog      2006-04-03 
12:26:39 UTC (rev 58945)
+++ branches/mainsoft/gh1.7/mcs/class/System.XML/ChangeLog      2006-04-03 
12:28:02 UTC (rev 58946)
@@ -1,3 +1,8 @@
+2006-04-03  Andrew Skiba <[EMAIL PROTECTED]>
+
+       * run-tests.bat, run-W3C-tests.bat, run-XSLT-tests.bat: batch files
+       for running tests with java
+
 2055-12-01  Konstantin Triger <[EMAIL PROTECTED]>
 
        * Makefile: java profile reference change.

Modified: 
branches/mainsoft/gh1.7/mcs/class/System.XML/Test/System.Xml/W3C/ChangeLog
===================================================================
--- branches/mainsoft/gh1.7/mcs/class/System.XML/Test/System.Xml/W3C/ChangeLog  
2006-04-03 12:26:39 UTC (rev 58945)
+++ branches/mainsoft/gh1.7/mcs/class/System.XML/Test/System.Xml/W3C/ChangeLog  
2006-04-03 12:28:02 UTC (rev 58946)
@@ -1,3 +1,7 @@
+2006-04-03  Andrew Skiba  <[EMAIL PROTECTED]>
+
+       * W3C.vmwcsproj : use nunit from mono tree
+
 2005-10-23  Andrew Skiba  <[EMAIL PROTECTED]>
 
        * fixme.lst, knownFailures.lst: update to current failures list

Modified: 
branches/mainsoft/gh1.7/mcs/class/System.XML/Test/System.Xml/W3C/W3C.vmwcsproj
===================================================================
--- 
branches/mainsoft/gh1.7/mcs/class/System.XML/Test/System.Xml/W3C/W3C.vmwcsproj  
    2006-04-03 12:26:39 UTC (rev 58945)
+++ 
branches/mainsoft/gh1.7/mcs/class/System.XML/Test/System.Xml/W3C/W3C.vmwcsproj  
    2006-04-03 12:28:02 UTC (rev 58946)
@@ -7,12 +7,10 @@
                        </Settings>
                        <References>
                                <Reference Name="System" AssemblyName="System" 
HintPath="..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"/>
-                               <Reference Name="System.Data" 
AssemblyName="System.Data" 
HintPath="..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.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.core" 
AssemblyName="nunit.core" 
HintPath="..\..\..\..\..\..\..\..\views\DevQA\studio\GH\DevQA\tests\utils\nunit\nunit-2.2.0\nunit-console\bin\Debug_Java\nunit.core.dll"
 Private="True"/>
-                               <Reference Name="nunit.framework" 
AssemblyName="nunit.framework" 
HintPath="..\..\..\..\..\..\..\..\views\DevQA\studio\GH\DevQA\tests\utils\nunit\nunit-2.2.0\nunit-console\bin\Debug_Java\nunit.framework.dll"
 Private="True"/>
-                               <Reference Name="nunit.util" 
AssemblyName="nunit.util" 
HintPath="..\..\..\..\..\..\..\..\views\DevQA\studio\GH\DevQA\tests\utils\nunit\nunit-2.2.0\nunit-console\bin\Debug_Java\nunit.util.dll"
 Private="True"/>
+                               <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"/>
                        </References>
                </Build>
                <Files>

Modified: 
branches/mainsoft/gh1.7/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/ChangeLog
===================================================================
--- 
branches/mainsoft/gh1.7/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/ChangeLog
 2006-04-03 12:26:39 UTC (rev 58945)
+++ 
branches/mainsoft/gh1.7/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/ChangeLog
 2006-04-03 12:28:02 UTC (rev 58946)
@@ -1,3 +1,7 @@
+2006-04-03  Andrew Skiba <[EMAIL PROTECTED]>
+
+       * xslt.vmwcsproj : refer nunit from mono tree
+
 2005-11-23  Vladimir Krasnov  <[EMAIL PROTECTED]>
 
        * ignore.lst: adeed Keys__91835, idkey_idkey18, idkey_idkey50

Modified: 
branches/mainsoft/gh1.7/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt.vmwcsproj
===================================================================
--- 
branches/mainsoft/gh1.7/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt.vmwcsproj
    2006-04-03 12:26:39 UTC (rev 58945)
+++ 
branches/mainsoft/gh1.7/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslt.vmwcsproj
    2006-04-03 12:28:02 UTC (rev 58946)
@@ -10,9 +10,8 @@
                                <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="..\..\..\..\..\..\..\..\views\DevQA\studio\GH\DevQA\tests\utils\nunit\nunit-2.2.0\nunit-console\bin\Debug_Java\nunit.core.dll"
 Private="True"/>
-                               <Reference Name="nunit.framework" 
AssemblyName="nunit.framework" 
HintPath="..\..\..\..\..\..\..\..\views\DevQA\studio\GH\DevQA\tests\utils\nunit\nunit-2.2.0\nunit-console\bin\Debug_Java\nunit.framework.dll"
 Private="True"/>
-                               <Reference Name="nunit.util" 
AssemblyName="nunit.util" 
HintPath="..\..\..\..\..\..\..\..\views\DevQA\studio\GH\DevQA\tests\utils\nunit\nunit-2.2.0\nunit-console\bin\Debug_Java\nunit.util.dll"
 Private="True"/>
+                               <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"/>
                        </References>
                </Build>
                <Files>

Copied: branches/mainsoft/gh1.7/mcs/class/System.XML/run-W3C-tests.bat (from 
rev 58936, trunk/mcs/class/System.XML/run-W3C-tests.bat)

Copied: branches/mainsoft/gh1.7/mcs/class/System.XML/run-XSLT-tests.bat (from 
rev 58936, trunk/mcs/class/System.XML/run-XSLT-tests.bat)

Copied: branches/mainsoft/gh1.7/mcs/class/System.XML/run-tests.bat (from rev 
58936, trunk/mcs/class/System.XML/run-tests.bat)

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to