| Index: trunk/phase3/maintenance/tests/phpunit/includes/ExtraParserTest.php |
| — | — | @@ -2,12 +2,16 @@ |
| 3 | 3 | /** |
| 4 | 4 | * Parser-related tests that don't suit for parserTests.txt |
| 5 | 5 | */ |
| 6 | | - |
| | 6 | + |
| 7 | 7 | class ExtraParserTest extends PHPUnit_Framework_TestCase { |
| 8 | 8 | |
| 9 | 9 | function setUp() { |
| 10 | 10 | global $wgMemc; |
| | 11 | + global $wgContLang; |
| | 12 | + global $wgShowDBErrorBacktrace; |
| 11 | 13 | |
| | 14 | + $wgShowDBErrorBacktrace = true; |
| | 15 | + if ( $wgContLang === null ) $wgContLang = new Language; |
| 12 | 16 | $wgMemc = new FakeMemCachedClient; |
| 13 | 17 | } |
| 14 | 18 | |
| — | — | @@ -24,7 +28,7 @@ |
| 25 | 29 | $parser = new Parser(); |
| 26 | 30 | $t = Title::newFromText( 'Unit test' ); |
| 27 | 31 | $options = new ParserOptions(); |
| 28 | | - $this->assertEquals( "<p>$longLine</p>", |
| | 32 | + $this->assertEquals( "<p>$longLine</p>", |
| 29 | 33 | $parser->parse( $longLine, $t, $options )->getText() ); |
| 30 | 34 | } |
| 31 | 35 | } |
| Index: trunk/phase3/maintenance/tests/phpunit/Makefile |
| — | — | @@ -1,6 +1,7 @@ |
| 2 | 2 | .PHONY: help test phpunit install coverage |
| 3 | 3 | |
| 4 | | -CONFIG_FILE = suite.xml |
| | 4 | +SHELL = /bin/sh |
| | 5 | +CONFIG_FILE = $(shell pwd)/suite.xml |
| 5 | 6 | FLAGS = |
| 6 | 7 | PU = phpunit --configuration ${CONFIG_FILE} |
| 7 | 8 | |