diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2006-01-06 07:33:14 +0300 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2006-01-06 07:33:14 +0300 |
| commit | 6b7a7509dfbe0c53b57bf378027465184556eff9 (patch) | |
| tree | 0234fb9970a962c375747d936fd5a5ad66694b4e /mcs/class/System.XML | |
| parent | 2b56366922a906082267e37788588ae37bb21a7e (diff) | |
2006-01-06 Atsushi Enomoto <atsushi@ximian.com>
* XsltTestUtils.cs,
catalog.sed,
xslttest.cs,
Makefile : To run under Linux, strip \r. Fixed mcs -r arguments
(case sensitive).
svn path=/trunk/mcs/; revision=55128
Diffstat (limited to 'mcs/class/System.XML')
5 files changed, 13 insertions, 4 deletions
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 8b109b0744a..fb6ae46480d 100644 --- 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,11 @@ +2006-01-06 Atsushi Enomoto <atsushi@ximian.com> + + * XsltTestUtils.cs, + catalog.sed, + xslttest.cs, + Makefile : To run under Linux, strip \r. Fixed mcs -r arguments + (case sensitive). + 2005-11-23 Vladimir Krasnov <vladimirk@mainsoft.com> * ignore.lst: adeed Keys__91835, idkey_idkey18, idkey_idkey50 diff --git a/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/Makefile b/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/Makefile index b132b221d47..d7f57bc6c48 100644 --- a/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/Makefile +++ b/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/Makefile @@ -84,13 +84,13 @@ endif $(GENERATE_EXE) : generate.cs XsltTestUtils.cs $(CSCOMPILE) generate.cs XsltTestUtils.cs -out:$@ $(TEST_PROG) : xslttest.cs XsltTestUtils.cs - $(CSCOMPILE) xslttest.cs XsltTestUtils.cs XmlCompare.cs -r:NUnit.core -r:NUnit.framework -out:$@ -t:library + $(CSCOMPILE) xslttest.cs XsltTestUtils.cs XmlCompare.cs -r:nunit.core -r:nunit.framework -out:$@ -t:library catalog-fixed : $(FIXED_CATALOG) $(FIXED_CATALOG) : $(CATALOG) catalog.sed catalog-fixed.diff sed -f catalog.sed $(CATALOG) > $(FIXED_CATALOG) - patch -p0 $(FIXED_CATALOG) < catalog-fixed.diff + patch -p0 -i catalog-fixed.diff catalog : $(CATALOG) diff --git a/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/XsltTestUtils.cs b/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/XsltTestUtils.cs index 4a032049e63..3cbc75647ba 100644 --- a/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/XsltTestUtils.cs +++ b/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/XsltTestUtils.cs @@ -257,7 +257,7 @@ namespace MonoTests.oasis_xslt { IXPathNavigable input = LoadInput (); using (StringWriter sw = new StringWriter ()) { trans.Transform (input, null, sw, null); - _result = sw.ToString (); + _result = sw.ToString ().Replace ("\r\n", "\n"); } } catch (System.Exception e) { diff --git a/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/catalog.sed b/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/catalog.sed index a783b03a4b2..509d809cce7 100644 --- a/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/catalog.sed +++ b/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/catalog.sed @@ -5,3 +5,4 @@ s/outp\([0-9]\+\)/output\1/g s/str\([0-9]\+\)/string\1/g s/expr\([0-9]\+\)/expression\1/g s/<file-path>Value-of<\/file-path>/<file-path>Valueof<\/file-path>/ +s/\r//g diff --git a/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslttest.cs b/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslttest.cs index 41b9c9d924e..cbddef212ad 100644 --- a/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslttest.cs +++ b/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/xslttest.cs @@ -183,7 +183,7 @@ namespace MonoTests.oasis_xslt { if (_transform.Succeeded) { try { using (StreamReader sr = new StreamReader (_transform.TestCase.OutFile)) - failureMessage = CompareResult (_transform.Result, sr.ReadToEnd (), _transform.TestCase.Compare); + failureMessage = CompareResult (_transform.Result, sr.ReadToEnd ().Replace ("\r\n", "\n"), _transform.TestCase.Compare); } catch { //if there is no reference result because of expectedException, we |