From: Wil Mahan <wmahan@users.mediawiki.org>
Date: Mon, 11 Oct 2004 21:55:35 +0000 (+0000)
Subject: Pass the -a option to diff in case there are tests with
X-Git-Tag: 1.5.0alpha1~1579
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=75d16c99a65f3db6242cd114f379bffd4de30574;p=lhc%2Fweb%2Fwiklou.git

Pass the -a option to diff in case there are tests with
non-text characters; set wgMaxTocLevel global; use
.PHONY target in Makefile in case someone happens
to have a file named 'test' or similar in the
maintenance/ directory.
---

diff --git a/maintenance/Makefile b/maintenance/Makefile
index 8ceeb797ad..1138fe6edb 100644
--- a/maintenance/Makefile
+++ b/maintenance/Makefile
@@ -1,3 +1,4 @@
+.PHONY: help make test
 help:
 	# Run 'make test' to run the parser tests.
 	# Run 'make doc' to run the phpdoc generation.
diff --git a/maintenance/parserTests.php b/maintenance/parserTests.php
index cc1d49cef7..a6bcb33a31 100644
--- a/maintenance/parserTests.php
+++ b/maintenance/parserTests.php
@@ -293,6 +293,7 @@ class ParserTest {
 			'wgLoadBalancer' => LoadBalancer::newFromParams( $GLOBALS['wgDBservers'] ),
 			'wgLang' => new LanguageUtf8(),
 			'wgNamespacesWithSubpages' => array( 0 => preg_match('/\\bsubpage\\b/i', $opts)),
+			'wgMaxTocLevel' => 999,
 			);
 		$this->savedGlobals = array();
 		foreach( $settings as $var => $val ) {
@@ -445,7 +446,7 @@ class ParserTest {
 		$outfile = "$prefix-actual";
 		$this->dumpToFile( $output, $outfile );
 		
-		$diff = `diff -u $infile $outfile`;
+		$diff = `diff -au $infile $outfile`;
 		unlink( $infile );
 		unlink( $outfile );