Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

1 files changed, 14 insertions, 0 deletions

diff --git a/tests/phpunit/includes/HtmlFormatterTest.php b/tests/phpunit/includes/HtmlFormatterTest.php
index 9dbfa452..1c3e8539 100644
--- a/tests/phpunit/includes/HtmlFormatterTest.php
+++ b/tests/phpunit/includes/HtmlFormatterTest.php
@@ -4,6 +4,20 @@
  * @group HtmlFormatter
  */
 class HtmlFormatterTest extends MediaWikiTestCase {
+
+	/**
+	 * Use TidySupport to check whether we should use $wgTidyInternal.
+	 *
+	 * The Tidy extension in HHVM does not support error text return, so it is
+	 * nominally usable, but does not pass tests which require error text from
+	 * Tidy.
+	 */
+	protected function setUp() {
+		parent::setUp();
+		$tidySupport = new TidySupport();
+		$this->setMwGlobals( 'wgTidyInternal', $tidySupport->isInternal() );
+	}
+
 	/**
 	 * @dataProvider getHtmlData
 	 *