From: C. Scott Ananian <cscott@cscott.net>
Date: Fri, 15 Mar 2019 18:15:26 +0000 (-0400)
Subject: Temporarily trim leading/trailing whitespace from parser test clauses
X-Git-Tag: 1.34.0-rc.0~2477^2~2
X-Git-Url: http://git.cyclocoop.org/%22.htmlspecialchars%28%24url_syndic%29.%22?a=commitdiff_plain;h=19262326bb0a43e9b58f05064459417e895010af;p=lhc%2Fweb%2Fwiklou.git

Temporarily trim leading/trailing whitespace from parser test clauses

This allows us to break a circular dependency in the patches for T208070.
It will be reverted as soon as T208070 is merged.

Bug: T208070
Change-Id: I3da235cb83efa424f0cf1cf4fc7233240fcdf6b2
---

diff --git a/tests/parser/ParserTestRunner.php b/tests/parser/ParserTestRunner.php
index 699de951b6..6bf781d7fa 100644
--- 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 );