Merge "Temporarily trim leading/trailing whitespace from parser test clauses"

diff --git a/tests/parser/ParserTestRunner.php b/tests/parser/ParserTestRunner.php
index 699de95..6bf781d 100644 (file)
--- a/tests/parser/ParserTestRunner.php
+++ b/tests/parser/ParserTestRunner.php
@@ -919,6 +919,10 @@ class ParserTestRunner {
                ScopedCallback::consume( $teardownGuard );
 
                $expected = $test['result'];
+               // Temporary hack to allow merge of T208070 patches
+               $expected = trim( $expected );
+               $out = trim( $expected );
+               // End temporary hack
                if ( count( $this->normalizationFunctions ) ) {
                        $expected = ParserTestResultNormalizer::normalize(
                                $test['expected'], $this->normalizationFunctions );