From 32f374074cd581bfe9cfdae80d50f9aadccff9af Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Tue, 8 Mar 2016 18:32:37 +0000
Subject: [PATCH] parserTest: Remove mention of non-existent 'noxml' option

The 'noxml' documentation in parserTests.txt was added in 2006 (7eea2398; r12504),
however it wasn't actually implemented.

It wasn't until 2009 (7aa4a8f9; r54767) that $wgWellFormedXml was created,
which defaults to true and has no relation to this option.

Remove the 'noxml' options from existing tests.

Change-Id: Ie3ae9f491b5747716080607b81b9763bf2bcc889
---
 tests/parser/extraParserTests.txt             | Bin 1261 -> 1243 bytes
 tests/parser/parserTests.txt                  |  17 +++++------------
 .../phpunit/includes/parser/NewParserTest.php |   1 +
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/tests/parser/extraParserTests.txt b/tests/parser/extraParserTests.txt
index bef8f506da50cf32635a51861907122bc0356056..a48087e25d49c6a92025de4e102ff76c8ab1ef5b 100644
GIT binary patch
delta 36
lcmaFMd7E>CJLBXyW{t_7EaH=U7*E03vzhj8j$`g;1OV<^40Heh

delta 46
ncmcc3`Id8oJ0ojeenoE1WPc`y$!(0M;Jm+ZmgeRX=5$5?ow*S7

diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 356eed3f0e..b22cfd8642 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -18,7 +18,6 @@
 # ill           add inter-language links
 #               (ignored by Parsoid, since it emits <link>s)
 # subpage       enable subpages (disabled by default)
-# noxml         don't check for XML well-formedness
 # title=[[XXX]] run test using article title XXX
 # language=XXX  set content language to XXX for this test
 # variant=XXX   set the variant of language for this test (eg zh-tw)
@@ -12163,7 +12162,7 @@ This template has <!-- a comment --> in it.
 !! test
 pre-save transform: unclosed tag
 !! options
-pst noxml
+pst
 !! wikitext
 <nowiki>'''not wiki'''
 !! html/php
@@ -12173,7 +12172,7 @@ pst noxml
 !! test
 pre-save transform: mixed tag case
 !! options
-pst noxml
+pst
 !! wikitext
 <NOwiki>'''not wiki'''</noWIKI>
 !! html/php
@@ -12183,7 +12182,7 @@ pst noxml
 !! test
 pre-save transform: unclosed comment in <nowiki>
 !! options
-pst noxml
+pst
 !! wikitext
 wiki<nowiki>nowiki<!--nowiki</nowiki>wiki
 !! html/php
@@ -16414,8 +16413,6 @@ array (
 
 !! test
 Parser hook: nested tags
-!! options
-noxml
 !! wikitext
 <tag><tag></tag></tag>
 !! html/php
@@ -17070,8 +17067,6 @@ Fuzz testing: Parser14-table
 # Known to produce bogus xml (extra </td>)
 !! test
 Fuzz testing: Parser16
-!! options
-noxml
 !! wikitext
 {|
 !https://||||||
@@ -17133,8 +17128,6 @@ http://===r:::https://b
 # Known to produce bad XML for now
 !! test
 Fuzz testing: Parser24
-!! options
-noxml
 !! wikitext
 {|
 {{{|
@@ -18199,7 +18192,7 @@ section=1
 !! test
 Section extraction, <pre> around bogus header (bug 10309)
 !! options
-noxml section=2
+section=2
 !! wikitext
 == Section One ==
 <pre>
@@ -18216,7 +18209,7 @@ stuff
 !! test
 Section replacement, <pre> around bogus header (bug 10309)
 !! options
-noxml replace=2,"xxx"
+replace=2,"xxx"
 !! wikitext
 == Section One ==
 <pre>
diff --git a/tests/phpunit/includes/parser/NewParserTest.php b/tests/phpunit/includes/parser/NewParserTest.php
index b0c15250e3..b1119a1925 100644
--- a/tests/phpunit/includes/parser/NewParserTest.php
+++ b/tests/phpunit/includes/parser/NewParserTest.php
@@ -433,6 +433,7 @@ class NewParserTest extends MediaWikiTestCase {
 			'wgThumbLimits' => [ self::getOptionValue( 'thumbsize', $opts, 180 ) ],
 			'wgMaxTocLevel' => $maxtoclevel,
 			'wgUseTeX' => isset( $opts['math'] ) || isset( $opts['texvc'] ),
+			'wgWellFormedXml' => true,
 			'wgMathDirectory' => $uploadDir . '/math',
 			'wgDefaultLanguageVariant' => $variant,
 			'wgLinkHolderBatchSize' => $linkHolderBatchSize,
-- 
2.20.1