r72256 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r72255‎ | r72256 | r72257 >
Date:02:14, 3 September 2010
Author:tparscal
Status:deferred
Tags:
Comment:
Merged from head.
Modified paths:
  • /branches/resourceloader/phase3/maintenance/tests/phpunit (modified) (history)

Diff [purge]

Index: branches/resourceloader/phase3/maintenance/tests/phpunit
@@ -2,7 +2,14 @@
33 <?php
44
55 require( dirname( __FILE__ ) . '/../commandLine.inc' );
6 -require_once 'PHPUnit/Autoload.php';
 6+// XXX: This can go away if everyone switches to PHPUnit 3.5
 7+if ( @file_get_contents( 'PHPUnit/Autoload.php', true ) !== false ) {
 8+ // Works for PHPUnit >= 3.5
 9+ require_once 'PHPUnit/Autoload.php';
 10+} else {
 11+ // Works for PHPUnit < 3.5
 12+ require_once 'PHPUnit/TextUI/Command.php';
 13+}
714 define( 'MW_PHPUNIT_TEST', 1 );
815
916 $wgLocaltimezone = 'UTC';
Property changes on: branches/resourceloader/phase3/maintenance/tests/phpunit
___________________________________________________________________
Added: svn:mergeinfo
1017 Merged /branches/sqlite/maintenance/tests/phpunit:r58211-58321
1118 Merged /trunk/phase3/maintenance/tests/phpunit:r68366-72255
1219 Merged /branches/new-installer/phase3/maintenance/tests/phpunit:r43664-66004
1320 Merged /branches/REL1_15/phase3/maintenance/tests/phpunit:r51646

Status & tagging log