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 8ceeb79..1138fe6 100644 (file)
--- 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 cc1d49c..a6bcb33 100644 (file)
--- 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 );