From 4963502708a675b1e38be8e05f107b6401780914 Mon Sep 17 00:00:00 2001 From: Andrew Skiba Date: Sun, 8 May 2005 07:02:37 +0000 Subject: [PATCH] * catalog.diff : deleted, replaced by catalog.sed * catalog.sed : added new file * Makefile : now it does not exctract catalog every run; output patched catalog into a different filename; breaked the extraction into a separate target so it's done only when needed. * xslttest.cs : open a patched catalog, not an original one svn path=/trunk/mcs/; revision=44213 --- .../System.Xml.Xsl/standalone_tests/ChangeLog | 9 + .../System.Xml.Xsl/standalone_tests/Makefile | 24 +- .../standalone_tests/catalog.diff | 2509 ----------------- .../standalone_tests/catalog.sed | 3 + .../standalone_tests/xslttest.cs | 2 +- 5 files changed, 27 insertions(+), 2520 deletions(-) delete mode 100644 mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/catalog.diff create mode 100644 mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/catalog.sed 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 3813e5f6d53..0979733b3ff 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,12 @@ +2005-05-08 Andrew Skiba + + * catalog.diff : deleted, replaced by catalog.sed + * catalog.sed : added new file + * Makefile : now it does not exctract catalog every run; output + patched catalog into a different filename; breaked the extraction into + a separate target so it's done only when needed. + * xslttest.cs : open a patched catalog, not an original one + 2005-03-22 Atsushi Enomoto * xslttest.cs, alltest.cs : Now that xsl:key got improved, there is 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 4d97f2d4559..23b06a2743b 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 @@ -22,9 +22,9 @@ test : xslttest.exe alltest.exe prepare prepare : $(TESTS) prepare-xslt prepare-mstest -prepare-xslt : xslttest.exe $(XSLTTEST_RESULTS) +prepare-xslt : xslttest.exe $(XSLTTEST_RESULTS) testsuite/TESTS/catalog-fixed.xml -prepare-mstest : alltest.exe $(MSTEST_RESULTS) +prepare-mstest : alltest.exe $(MSTEST_RESULTS) testsuite/TESTS/catalog-out.xml xslttest.exe : xslttest.cs $(CSCOMPILE) xslttest.cs @@ -35,19 +35,23 @@ xmlnorm.exe : XmlNormalizer.cs alltest.exe : alltest.cs $(CSCOMPILE) alltest.cs -# WARNING: It removes catalog.xml. If you want to keep catalog.xml, comment -# "rm" and "patch" lines out. +testsuite/TESTS/catalog-fixed.xml : testsuite/TESTS/catalog.xml catalog.sed + sed -f catalog.sed testsuite/TESTS/catalog.xml > testsuite/TESTS/catalog-fixed.xml + $(TESTS) : $(TEST_ARCHIVE) simplify.xsl - rm -f testsuite/TESTS/catalog.xml - unzip -n $(TEST_ARCHIVE) - patch testsuite/TESTS/catalog.xml catalog.diff - xsltproc simplify.xsl testsuite/TESTS/catalog.xml > testsuite/TESTS/catalog-out.xml + unzip -un $(TEST_ARCHIVE) + touch $(TESTS) + +testsuite/TESTS/catalog-out.xml : testsuite/TESTS/catalog-fixed.xml simplify.xsl + xsltproc simplify.xsl testsuite/TESTS/catalog-fixed.xml > testsuite/TESTS/catalog-out.xml $(XSLTTEST_RESULTS) : $(XSLTTEST_RESULTS_ARCHIVE) unzip -n -d $(XSLTTEST_RESULTS_ARCHIVE) + touch $(XSLTTEST_RESULTS) $(MSTEST_RESULTS) : $(MSTEST_RESULTS_ARCHIVE) unzip -n -d testsuite/TESTS $(MSTEST_RESULTS_ARCHIVE) + touch $(MSTEST_RESULTS) $(TEST_ARCHIVE) : wget http://www.oasis-open.org/committees/download.php/9584/$(TEST_ARCHIVE) @@ -60,10 +64,10 @@ $(MSTEST_RESULTS_ARCHIVE) : run-test : run-test-xslt run-test-ms -run-test-xslt : xslttest.exe +run-test-xslt : xslttest.exe testsuite/TESTS/catalog-fixed.xml $(RUNTIME) $(RUNTIME_FLAGS) xslttest.exe --report:TestResult.xml --xml --details --outall -run-test-ms : alltest.exe xmlnorm.exe +run-test-ms : alltest.exe xmlnorm.exe testsuite/TESTS/catalog-out.xml $(RUNTIME) $(RUNTIME_FLAGS) ./alltest.exe $(TARGET_RESULTS) mono ./xmlnorm.exe -s testsuite/TESTS/$(TARGET_RESULTS) testsuite/TESTS/norm-tmp rm -rf testsuite/TESTS/$(TARGET_RESULTS) diff --git a/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/catalog.diff b/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/catalog.diff deleted file mode 100644 index d69c637b262..00000000000 --- a/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/catalog.diff +++ /dev/null @@ -1,2509 +0,0 @@ ---- catalog.xml 2004-07-12 17:35:00.000000000 +0900 -+++ catalog-new.xml 2005-02-15 16:50:38.959713600 +0900 -@@ -4698,9 +4698,9 @@ - Test of lang() function - - --expr04.xml --expr04.xsl --expr04.out -+expression04.xml -+expression04.xsl -+expression04.out - - - -@@ -12276,94 +12276,94 @@ - numbering95.out - - -- -+ - output - Test for SCRIPT handling - - --outp01.xml --outp01.xsl --outp01.out -+output01.xml -+output01.xsl -+output01.out - - -- -+ - output - Test for STYLE handling - - --outp02.xml --outp02.xsl --outp02.out -+output02.xml -+output02.xsl -+output02.out - - -- -+ - output - Test for disabling output escaping in xsl:text - - --outp03.xml --outp03.xsl --outp03.out -+output03.xml -+output03.xsl -+output03.out - - -- -+ - output - Test for numbered character entities - - --outp04.xml --outp04.xsl --outp04.out -+output04.xml -+output04.xsl -+output04.out - - -- -+ - output - Test for "whitespace sensitive" html tags; <img>, <applet>, <object> - - --outp05.xml --outp05.xsl --outp05.out -+output05.xml -+output05.xsl -+output05.out - - -- -+ - output - Test for disabling output escaping in xsl:value-of - - --outp06.xml --outp06.xsl --outp06.out -+output06.xml -+output06.xsl -+output06.out - - -- -+ - output - Test for enabling output escaping in xsl:value-of, XML output - - --outp07.xml --outp07.xsl --outp07.out -+output07.xml -+output07.xsl -+output07.out - - -- -+ - output - Test for enabling output escaping in xsl:text, HTML output - - --outp08.xml --outp08.xsl --outp08.out -+output08.xml -+output08.xsl -+output08.out - - -- -+ - output - Test for disabling output escaping in a variable with xsl:text, HTML output - - --outp09.xml --outp09.xsl --outp09.out -+output09.xml -+output09.xsl -+output09.out - - - -@@ -12371,99 +12371,99 @@ - test for disabling output escaping in a variable with xsl:value-of - - --outp10.xml --outp10.xsl --outp10.out -+output10.xml -+output10.xsl -+output10.out - - -- -+ - output - Test for the xml output method by itself - - --outp11.xml --outp11.xsl --outp11.out -+output11.xml -+output11.xsl -+output11.out - - -- -+ - output - Test for the xml output method by itself with omit-xml-declaration - - --outp12.xml --outp12.xsl --outp12.out -+output12.xml -+output12.xsl -+output12.out - - -- -+ - output - Test for doctype-system - - --outp13.xml --outp13.xsl --outp13.out -+output13.xml -+output13.xsl -+output13.out - - -- -+ - output - Test for doctype-public only - - --outp14.xml --outp14.xsl --outp14.out -+output14.xml -+output14.xsl -+output14.out - - -- -+ - output - Test for doctype-system and doctype-public - - --outp15.xml --outp15.xsl --outp15.out -+output15.xml -+output15.xsl -+output15.out - - -- -+ - output - Test for doctype-system with html method - - --outp16.xml --outp16.xsl --outp16.out -+output16.xml -+output16.xsl -+output16.out - - -- -+ - output - Test for doctype-public only with html method - - --outp17.xml --outp17.xsl --outp17.out -+output17.xml -+output17.xsl -+output17.out - - -- -+ - output - Test for doctype-system and doctype-public with html method - - --outp18.xml --outp18.xsl --outp18.out -+output18.xml -+output18.xsl -+output18.out - - -- -+ - output - Test US-ASCII encoding. - - --outp19.xml --outp19.xsl --outp19.out -+output19.xml -+output19.xsl -+output19.out - - - -@@ -12471,19 +12471,19 @@ - Test SHIFT_JIS encoding. - - --outp20.xml --outp20.xsl --outp20.out -+output20.xml -+output20.xsl -+output20.out - - -- -+ - output - Test BIG5 encoding. - - --outp21.xml --outp21.xsl --outp21.out -+output21.xml -+output21.xsl -+output21.out - - - -@@ -12496,84 +12496,84 @@ - output22.out - - -- -+ - output - Test ISO-2022-JP encoding. - - --outp23.xml --outp23.xsl --outp23.out -+output23.xml -+output23.xsl -+output23.out - - -- -+ - output - Escape of non-ASCII chars in URI attribute values using method cited in Section B.2.1 of HTML 4.0 Spec. This test is a duplicate of OUTP31, except that the output is XML. - - --outp24.xml --outp24.xsl --outp24.out -+output24.xml -+output24.xsl -+output24.out - - -- -+ - output - ??? - - --outp25.xml --outp25.xsl --outp25.out -+output25.xml -+output25.xsl -+output25.out - - -- -+ - output - Text output of characters encoded between 128 and 255 - - --outp26.xml --outp26.xsl --outp26.out -+output26.xml -+output26.xsl -+output26.out - - -- -+ - output - Result tree here defaults to XML Test for cdata-section-elements with nonrepresentable character. - - --outp28.xml --outp28.xsl --outp28.out -+output28.xml -+output28.xsl -+output28.out - - -- -+ - output - Test cdata-section-elements. - - --outp29.xml --outp29.xsl --outp29.out -+output29.xml -+output29.xsl -+output29.out - - -- -+ - output - Test cdata-section-elements that looks like end of CDATA. - - --outp30.xml --outp30.xsl --outp30.out -+output30.xml -+output30.xsl -+output30.out - - -- -+ - output - ESC of non-ASCII chars in URI attribute values using method sited in Section B.2.1 of HTML 4.0 Spec. - - --outp32.xml --outp32.xsl --outp32.out -+output32.xml -+output32.xsl -+output32.out - - - -@@ -12586,44 +12586,44 @@ - output33.out - - -- -+ - output - Names of HTML elements should be recognized regardless of case. - - --outp34.xml --outp34.xsl --outp34.out -+output34.xml -+output34.xsl -+output34.out - - -- -+ - output - Boolean attributes should be output in minimized form. - - --outp35.xml --outp35.xsl --outp35.out -+output35.xml -+output35.xsl -+output35.out - - -- -+ - output - Processing instructions should be terminated with ">". - - --outp36.xml --outp36.xsl --outp36.out -+output36.xml -+output36.xsl -+output36.out - - -- -+ - output - "&" should not be escaped when occuring in an attribute value immediately followed by a "{". See to Section B.7.1 HTML 4.0 Recommendation. - - --outp37.xml --outp37.xsl --outp37.out -+output37.xml -+output37.xsl -+output37.out - - - -@@ -12636,54 +12636,54 @@ - output38.out - - -- -+ - output - Test of indent - - --outp39.xml --outp39.xsl --outp39.out -+output39.xml -+output39.xsl -+output39.out - - -- -+ - output - Test of indent - - --outp40.xml --outp40.xsl --outp40.out -+output40.xml -+output40.xsl -+output40.out - - -- -+ - output - Text node containing "]]>" and closure of CDATA section. - - --outp41.xml --outp41.xsl --outp41.out -+output41.xml -+output41.xsl -+output41.out - - -- -+ - output - Test of cdata-section-elements processing. - - --outp42.xml --outp42.xsl --outp42.out -+output42.xml -+output42.xsl -+output42.out - - -- -+ - output - Test of cdata-section-elements processing. <example> should not be processed. - - --outp43.xml --outp43.xsl --outp43.out -+output43.xml -+output43.xsl -+output43.out - - - -@@ -12696,14 +12696,14 @@ - output44.out - - -- -+ - output - xml method should not output XML declaration if omit-xml-declaration="yes". - - --outp45.xml --outp45.xsl --outp45.out -+output45.xml -+output45.xsl -+output45.out - - - -@@ -12716,276 +12716,276 @@ - output46.out - - -- -+ - output - Illegal use of disable-output-escaping. - - --outp47.xml --outp47.xsl --outp47.out -+output47.xml -+output47.xsl -+output47.out - - -- -+ - output - ... html output method should output a DTD immediately before the first element. - - --outp48.xml --outp48.xsl --outp48.out -+output48.xml -+output48.xsl -+output48.out - - -- -+ - output - HTML output method should not escape '<' in attribute values. - - --outp49.xml --outp49.xsl --outp49.out -+output49.xml -+output49.xsl -+output49.out - - -- -+ - output - Valid use of disable-output-escaping. - - --outp50.xml --outp50.xsl --outp50.out -+output50.xml -+output50.xsl -+output50.out - - -- -+ - output - Test of indent attribute by itself. - - --outp51.xml --outp51.xsl --outp51.out -+output51.xml -+output51.xsl -+output51.out - - -- -+ - output - html output method should not output white space after the image tag within the anchor tag. - - --outp52.xml --outp52.xsl --outp52.out -+output52.xml -+output52.xsl -+output52.out - - -- -+ - output - Basic test for creating a comment. - - --outp53.xml --outp53.xsl --outp53.out -+output53.xml -+output53.xsl -+output53.out - - -- -+ - output - Test for creating a comment using a formula. - - --outp54.xml --outp54.xsl --outp54.out -+output54.xml -+output54.xsl -+output54.out - - -- -+ - output - Test creating a comment from a path expression. - - --outp55.xml --outp55.xsl --outp55.out -+output55.xml -+output55.xsl -+output55.out - - -- -+ - output - Test creating a comment from a variable. - - --outp56.xml --outp56.xsl --outp56.out -+output56.xml -+output56.xsl -+output56.out - - -- -+ - output - Test use of xsl:if and xsl:text inside xsl:comment. - - --outp57.xml --outp57.xsl --outp57.out -+output57.xml -+output57.xsl -+output57.out - - -- -+ - output - Test creation of a top-level comment. - - --outp58.xml --outp58.xsl --outp58.out -+output58.xml -+output58.xsl -+output58.out - - -- -+ - output - Test creation of a top-level processing-instruction before the document element. - - --outp59.xml --outp59.xsl --outp59.out -+output59.xml -+output59.xsl -+output59.out - - -- -+ - output - Do everything inside an HTML element. Note first item in this file. - - --outp60.xml --outp60.xsl --outp60.out -+output60.xml -+output60.xsl -+output60.out - - -- -+ - output - Test for disabling output escaping in xsl:value-of on ., which has special code. XML method. - - --outp61.xml --outp61.xsl --outp61.out -+output61.xml -+output61.xsl -+output61.out - - -- -+ - output - Test for disabling output escaping in xsl:value-of on ., which has special code. HTML method. - - --outp62.xml --outp62.xsl --outp62.out -+output62.xml -+output62.xsl -+output62.out - - -- -+ - output - Paul Dick - 2001-11-08 - The html output method should not output an element differently from the xml output method unless the expanded-name of the element has a null namespace URI; an element whose expanded-name has a non-null namespace URI should be output as XML. So the html tags <p>, <hr> and <br> in this case, due to the default html namespace will be output as xml not html. - - --outp63.xml --outp63.xsl --outp63.out -+output63.xml -+output63.xsl -+output63.out - - -- -+ - output - Generate output tagged for WML - - --outp64.xml --outp64.xsl --outp64.out -+output64.xml -+output64.xsl -+output64.out - - -- -+ - output - Test for special case for XHTML - - --outp65.xml --outp65.xsl --outp65.out -+output65.xml -+output65.xsl -+output65.out - - -- -+ - output - Verify standalone attribute set to "no". - - --outp66.xml --outp66.xsl --outp66.out -+output66.xml -+output66.xsl -+output66.out - - -- -+ - output - Verify standalone attribute set to "yes". - - --outp67.xml --outp67.xsl --outp67.out -+output67.xml -+output67.xsl -+output67.out - - -- -+ - output - Test for-each inside xsl:comment. - - --outp68.xml --outp68.xsl --outp68.out -+output68.xml -+output68.xsl -+output68.out - - -- -+ - output - Test for-each inside xsl:processing-instruction. - - --outp69.xml --outp69.xsl --outp69.out -+output69.xml -+output69.xsl -+output69.out - - -- -+ - output - Quotes and apostrophes can be used inside themselves, without terminating the string, if entered as entities. - - --outp70.xml --outp70.xsl --outp70.out -+output70.xml -+output70.xsl -+output70.out - - -- -+ - output - Test that implied HTML output assumes indent=yes. - - --outp71.xml --outp71.xsl --outp71.out -+output71.xml -+output71.xsl -+output71.out - - -- -+ - output - Test the generation of Processing instructions. - - --outp72.xml --outp72.xsl --outp72.out -+output72.xml -+output72.xsl -+output72.out - - -- -+ - output - Test SHIFT_JIS encoding on HTML output. - - --outp73.xml --outp73.xsl --outp73.out -+output73.xml -+output73.xsl -+output73.out - - - -@@ -15459,14 +15459,14 @@ - predicate58.out - - -- -+ - processorinfo - Test the xsl:vendor-url system property - - --prop03.xml --prop03.xsl --prop03.out -+processorinfo03.xml -+processorinfo03.xsl -+processorinfo03.out - - - -@@ -17085,94 +17085,94 @@ - string04.out - - -- -+ - string - Test of 'string()' conversion w/ element node - - --str05.xml --str05.xsl --str05.out -+string05.xml -+string05.xsl -+string05.out - - -- -+ - string - Test of 'starts-with()' - - --str06.xml --str06.xsl --str06.out -+string06.xml -+string06.xsl -+string06.out - - -- -+ - string - Test of 'contains()' - - --str07.xml --str07.xsl --str07.out -+string07.xml -+string07.xsl -+string07.out - - -- -+ - string - Test of 'substring-before()' - - --str08.xml --str08.xsl --str08.out -+string08.xml -+string08.xsl -+string08.out - - -- -+ - string - Test of 'substring-after()' - - --str09.xml --str09.xsl --str09.out -+string09.xml -+string09.xsl -+string09.out - - -- -+ - string - Test of 'normalize-space()' function - - --str10.xml --str10.xsl --str10.out -+string10.xml -+string10.xsl -+string10.out - - -- -+ - string - Test of 'translate()' - - --str11.xml --str11.xsl --str11.out -+string11.xml -+string11.xsl -+string11.out - - -- -+ - string - Test of 'concat()' - - --str09.xml --str09.xsl --str09.out -+string12.xml -+string12.xsl -+string12.out - - -- -+ - string - Test of 'format-number()' function. - - --str13.xml --str13.xsl --str13.out -+string13.xml -+string13.xsl -+string13.out - - - -@@ -17187,848 +17187,848 @@ - string14.out - - -- -+ - string - Test of 'substring()' function. - - --str15.xml --str15.xsl --str15.out -+string15.xml -+string15.xsl -+string15.out - - -- -+ - string - Test of 'substring()' function. - - --str16.xml --str16.xsl --str16.out -+string16.xml -+string16.xsl -+string16.out - - -- -+ - string - Test of 'substring()' function. - - --str17.xml --str17.xsl --str17.out -+string17.xml -+string17.xsl -+string17.out - - -- -+ - string - Test of 'substring()' function. - - --str18.xml --str18.xsl --str18.out -+string18.xml -+string18.xsl -+string18.out - - -- -+ - string - Test of 'substring()' function. - - --str19.xml --str19.xsl --str19.out -+string19.xml -+string19.xsl -+string19.out - - -- -+ - string - Test of 'substring()' function. - - --str20.xml --str20.xsl --str20.out -+string20.xml -+string20.xsl -+string20.out - - -- -+ - string - Test of 'substring()' function. - - --str21.xml --str21.xsl --str21.out -+string21.xml -+string21.xsl -+string21.out - - -- -+ - string - Test of 'substring()' function on non-existent node - - --str22.xml --str22.xsl --str22.out -+string22.xml -+string22.xsl -+string22.out - - -- -+ - string - Test of 'namespace-uri()'. - - --str30.xml --str30.xsl --str30.out -+string30.xml -+string30.xsl -+string30.out - - -- -+ - string - - --.xml --.xsl --.out -+string31.xml -+string31.xsl -+string31.out - - -- -+ - string - - --.xml --.xsl --.out -+string32.xml -+string32.xsl -+string32.out - - -- -+ - string - - --.xml --.xsl --.out -+string33.xml -+string33.xsl -+string33.out - - -- -+ - string - - --.xml --.xsl --.out -+string34.xml -+string34.xsl -+string34.out - - -- -+ - string - - --.xml --.xsl --.out -+string35.xml -+string35.xsl -+string35.out - - -- -+ - string - - --.xml --.xsl --.out -+string36.xml -+string36.xsl -+string36.out - - -- -+ - string - Test of 'string()' function. - - --str37.xml --str37.xsl --str37.out -+string37.xml -+string37.xsl -+string37.out - - -- -+ - string - Test of 'string()' function. - - --str38.xml --str38.xsl --str38.out -+string38.xml -+string38.xsl -+string38.out - - -- -+ - string - Test of 'string()' function. - - --str39.xml --str39.xsl --str39.out -+string39.xml -+string39.xsl -+string39.out - - -- -+ - string - Test of 'string()' function. - - --str40.xml --str40.xsl --str40.out -+string40.xml -+string40.xsl -+string40.out - - -- -+ - string - Test of 'string()' function. - - --str41.xml --str41.xsl --str41.out -+string41.xml -+string41.xsl -+string41.out - - -- -+ - string - Test of 'string()' function on a simple RTF. - - --str42.xml --str42.xsl --str42.out -+string42.xml -+string42.xsl -+string42.out - - -- -+ - string - Test of 'string()' function with empty RTF. - - --str43.xml --str43.xsl --str43.out -+string43.xml -+string43.xsl -+string43.out - - -- -+ - string - Test of 'starts-with()' function. - - --str44.xml --str44.xsl --str44.out -+string44.xml -+string44.xsl -+string44.out - - -- -+ - string - Test of 'starts-with()' function. - - --str45.xml --str45.xsl --str45.out -+string45.xml -+string45.xsl -+string45.out - - -- -+ - string - Test of 'starts-with()' function. - - --str46.xml --str46.xsl --str46.out -+string46.xml -+string46.xsl -+string46.out - - -- -+ - string - Test of 'starts-with()' function. - - --str47.xml --str47.xsl --str47.out -+string47.xml -+string47.xsl -+string47.out - - -- -+ - string - Test of 'starts-with()' function. - - --str48.xml --str48.xsl --str48.out -+string48.xml -+string48.xsl -+string48.out - - -- -+ - string - Test of 'starts-with()' function. - - --str49.xml --str49.xsl --str49.out -+string49.xml -+string49.xsl -+string49.out - - -- -+ - string - Test of 'starts-with()' function. - - --str50.xml --str50.xsl --str50.out -+string50.xml -+string50.xsl -+string50.out - - -- -+ - string - Test of 'starts-with()' function with node. - - --str51.xml --str51.xsl --str51.out -+string51.xml -+string51.xsl -+string51.out - - -- -+ - string - Test of 'starts-with()' function with node. - - --str52.xml --str52.xsl --str52.out -+string52.xml -+string52.xsl -+string52.out - - -- -+ - string - Test of 'starts-with()' function w/ attribute. - - --str53.xml --str53.xsl --str53.out -+string53.xml -+string53.xsl -+string53.out - - -- -+ - string - Test of 'starts-with()' function with attribute. - - --str54.xml --str54.xsl --str54.out -+string54.xml -+string54.xsl -+string54.out - - -- -+ - string - Test of 'contains()' function. - - --str55.xml --str55.xsl --str55.out -+string55.xml -+string55.xsl -+string55.out - - -- -+ - string - Test of 'contains()' function using variables. - - --str56.xml --str56.xsl --str56.out -+string56.xml -+string56.xsl -+string56.out - - -- -+ - string - Test of 'contains()' function using expressions. - - --str57.xml --str57.xsl --str57.out -+string57.xml -+string57.xsl -+string57.out - - -- -+ - string - Test of 'contains()' function. - - --str58.xml --str58.xsl --str58.out -+string58.xml -+string58.xsl -+string58.out - - -- -+ - string - Test of 'contains()' function. - - --str59.xml --str59.xsl --str59.out -+string59.xml -+string59.xsl -+string59.out - - -- -+ - string - Test of 'contains()' function. - - --str60.xml --str60.xsl --str60.out -+string60.xml -+string60.xsl -+string60.out - - -- -+ - string - Test of 'contains()' function. - - --str61.xml --str61.xsl --str61.out -+string61.xml -+string61.xsl -+string61.out - - -- -+ - string - Test of 'contains()' function. - - --str62.xml --str62.xsl --str62.out -+string62.xml -+string62.xsl -+string62.out - - -- -+ - string - Test of 'contains()' function. - - --str63.xml --str63.xsl --str63.out -+string63.xml -+string63.xsl -+string63.out - - -- -+ - string - Test of 'contains()' function with node as 1st argument, string is in it. - - --str64.xml --str64.xsl --str64.out -+string64.xml -+string64.xsl -+string64.out - - -- -+ - string - Test of 'contains()' function with node as 1st argument, string is not in it. - - --str65.xml --str65.xsl --str65.out -+string65.xml -+string65.xsl -+string65.out - - -- -+ - string - Test of 'contains()' function with attribute as 1st argument, string is in it. - - --str66.xml --str66.xsl --str66.out -+string66.xml -+string66.xsl -+string66.out - - -- -+ - string - Test of 'contains()' function with attribute as 1st argument, string is not in it. - - --str67.xml --str67.xsl --str67.out -+string67.xml -+string67.xsl -+string67.out - - -- -+ - string - Test of 'substring-before()' function. - - --str68.xml --str68.xsl --str68.out -+string68.xml -+string68.xsl -+string68.out - - -- -+ - string - Test of 'substring-before()' function. - - --str69.xml --str69.xsl --str69.out -+string69.xml -+string69.xsl -+string69.out - - -- -+ - string - Test of 'substring-before()' function. - - --str70.xml --str70.xsl --str70.out -+string70.xml -+string70.xsl -+string70.out - - -- -+ - string - Test of 'substring-before()' function with node. - - --str71.xml --str71.xsl --str71.out -+string71.xml -+string71.xsl -+string71.out - - -- -+ - string - Test of 'substring-before()' function with empty node. - - --str72.xml --str72.xsl --str72.out -+string72.xml -+string72.xsl -+string72.out - - -- -+ - string - Test of 'substring-before()' function with attribute. - - --str73.xml --str73.xsl --str73.out -+string73.xml -+string73.xsl -+string73.out - - -- -+ - string - Test of 'substring-before()' function with attribute. - - --str74.xml --str74.xsl --str74.out -+string74.xml -+string74.xsl -+string74.out - - -- -+ - string - Test of 'substring-before()' function with attribute. - - --str75.xml --str75.xsl --str75.out -+string75.xml -+string75.xsl -+string75.out - - -- -+ - string - Test of 'substring-after()' function. - - --str76.xml --str76.xsl --str76.out -+string76.xml -+string76.xsl -+string76.out - - -- -+ - string - Test of 'substring-after()' function. - - --str77.xml --str77.xsl --str77.out -+string77.xml -+string77.xsl -+string77.out - - -- -+ - string - Test of 'substring-after()' function. - - --str78.xml --str78.xsl --str78.out -+string78.xml -+string78.xsl -+string78.out - - -- -+ - string - Test of 'substring-after()' function. - - --str79.xml --str79.xsl --str79.out -+string79.xml -+string79.xsl -+string79.out - - -- -+ - string - Test of 'substring-after()' function with node. - - --str80.xml --str80.xsl --str80.out -+string80.xml -+string80.xsl -+string80.out - - -- -+ - string - Test of 'substring-after()' function with empty node. - - --str81.xml --str81.xsl --str81.out -+string81.xml -+string81.xsl -+string81.out - - -- -+ - string - Test of 'substring-after()' function with attribute - - --str82.xml --str82.xsl --str82.out -+string82.xml -+string82.xsl -+string82.out - - -- -+ - string - Test of 'substring-after()' function with attribute. - - --str83.xml --str83.xsl --str83.out -+string83.xml -+string83.xsl -+string83.out - - -- -+ - string - Test of 'substring-after()' function with attribute. - - --str84.xml --str84.xsl --str84.out -+string84.xml -+string84.xsl -+string84.out - - -- -+ - string - Test of 'normalize-space()' function with node. - - --str85.xml --str85.xsl --str85.out -+string85.xml -+string85.xsl -+string85.out - - -- -+ - string - Test of 'normaliz-space()' function with empty node. - - --str86.xml --str86.xsl --str86.out -+string86.xml -+string86.xsl -+string86.out - - -- -+ - string - Test of 'translate()' function. - - --str87.xml --str87.xsl --str87.out -+string87.xml -+string87.xsl -+string87.out - - -- -+ - string - Test of 'translate()' function. - - --str88.xml --str88.xsl --str88.out -+string88.xml -+string88.xsl -+string88.out - - -- -+ - string - Test of 'translate()' function. - - --str89.xml --str89.xsl --str89.out -+string89.xml -+string89.xsl -+string89.out - - -- -+ - string - Test of 'translate()' function. - - --str90.xml --str90.xsl --str90.out -+string90.xml -+string90.xsl -+string90.out - - -- -+ - string - Test of 'translate()' function. - - --str91.xml --str91.xsl --str91.out -+string91.xml -+string91.xsl -+string91.out - - -- -+ - string - Test of 'translate()' function with attributes. - - --str92.xml --str92.xsl --str92.out -+string92.xml -+string92.xsl -+string92.out - - -- -+ - string - Test of 'translate()' function with attributes. - - --str93.xml --str93.xsl --str93.out -+string93.xml -+string93.xsl -+string93.out - - -- -+ - string - Test of 'translate()' function with attributes. - - --str94.xml --str94.xsl --str94.out -+string94.xml -+string94.xsl -+string94.out - - -- -+ - string - Test of 'translate()' function. - - --str95.xml --str95.xsl --str95.out -+string95.xml -+string95.xsl -+string95.out - - -- -+ - string - Test of 'translate()' function. - - --str96.xml --str96.xsl --str96.out -+string96.xml -+string96.xsl -+string96.out - - -- -+ - string - Test of 'concat()' function. - - --str97.xml --str97.xsl --str97.out -+string97.xml -+string97.xsl -+string97.out - - -- -+ - string - Test of 'concat()' function with nodes. - - --str98.xml --str98.xsl --str98.out -+string98.xml -+string98.xsl -+string98.out - - -- -+ - string - Test of 'concat()' function with nodes. - - --str99.xml --str99.xsl --str99.out -+string99.xml -+string99.xsl -+string99.out - - -- -+ - string - Test of 'concat()' - - --str100.xml --str100.xsl --str100.out -+string100.xml -+string100.xsl -+string100.out - - -- -+ - string - Test of 'concat()' - - --str101.xml --str101.xsl --str101.out -+string101.xml -+string101.xsl -+string101.out - - -- -+ - string - Test of concat() on entities and expressions - - --str102.xml --str102.xsl --str102.out -+string102.xml -+string102.xsl -+string102.out - - -- -+ - string - Test of 'concat()' - - --str103.xml --str103.xsl --str103.out -+string103.xml -+string103.xsl -+string103.out - - -- -+ - string - Test of 'concat()' - - --str104.xml --str104.xsl --str104.out -+string104.xml -+string104.xsl -+string104.out - - -- -+ - string - Special case of concat() with one argument. Strictly speaking, this should fail just like STRerr14. - - --str105.xml --str105.xsl --str105.out -+string105.xml -+string105.xsl -+string105.out - - -- -+ - string - Test of 'format-number()' - - --str106.xml --str106.xsl --str106.out -+string106.xml -+string106.xsl -+string106.out - - - -@@ -18043,144 +18043,144 @@ - string107.out - - -- -+ - string - Test of 'format-number()' - - --str108.xml --str108.xsl --str108.out -+string108.xml -+string108.xsl -+string108.out - - -- -+ - string - Test of 'format-number()' - - --str109.xml --str109.xsl --str109.out -+string109.xml -+string109.xsl -+string109.out - - -- -+ - string - Test of 'format-number()' - - --str110.xml --str110.xsl --str110.out -+string110.xml -+string110.xsl -+string110.out - - -- -+ - string - Test of 'substring()' - - --str111.xml --str111.xsl --str111.out -+string111.xml -+string111.xsl -+string111.out - - -- -+ - string - Test of 'substring()' - - --str112.xml --str112.xsl --str112.out -+string112.xml -+string112.xsl -+string112.out - - -- -+ - string - Test of 'substring()' - - --str113.xml --str113.xsl --str113.out -+string113.xml -+string113.xsl -+string113.out - - -- -+ - string - Test of 'substring()' - - --str114.xml --str114.xsl --str114.out -+string114.xml -+string114.xsl -+string114.out - - -- -+ - string - Test of 'substring()' - - --str115.xml --str115.xsl --str115.out -+string115.xml -+string115.xsl -+string115.out - - -- -+ - string - Test of 'substring()' - - --str116.xml --str116.xsl --str116.out -+string116.xml -+string116.xsl -+string116.out - - -- -+ - string - Test of 'substring()' - - --str117.xml --str117.xsl --str117.out -+string117.xml -+string117.xsl -+string117.out - - -- -+ - string - Test of 'substring()' - - --str118.xml --str118.xsl --str118.out -+string118.xml -+string118.xsl -+string118.out - - -- -+ - string - Test of 'substring()' - - --str119.xml --str119.xsl --str119.out -+string119.xml -+string119.xsl -+string119.out - - -- -+ - string - Test of 'substring()' - - --str120.xml --str120.xsl --str120.out -+string120.xml -+string120.xsl -+string120.out - - -- -+ - string - Test of 'translate()' - - --str121.xml --str121.xsl --str121.out -+string121.xml -+string121.xsl -+string121.out - - - 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 new file mode 100644 index 00000000000..c129b4326ff --- /dev/null +++ b/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/catalog.sed @@ -0,0 +1,3 @@ +s/outp\([0-9]*\)/output\1/g +s/str\([0-9]*\)/string\1/g +s/expr\([0-9]*\)/expression\1/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 031a30e21d1..0ab771ba9de 100755 --- 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 @@ -160,7 +160,7 @@ FileMatch: + explicitTarget); XmlDocument whole = new XmlDocument (); - whole.Load (@"testsuite/TESTS/catalog.xml"); + whole.Load (@"testsuite/TESTS/catalog-fixed.xml"); if (!listOutput) Console.WriteLine ("Started: " + DateTime.Now.ToString ("yyyyMMdd-HHmmss.fff")); -- 2.25.1