http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72256
Revision: 72256
Author: tparscal
Date: 2010-09-03 02:14:51 +0000 (Fri, 03 Sep 2010)
Log Message:
-----------
Merged from head.
Modified Paths:
--------------
branches/resourceloader/phase3/maintenance/tests/phpunit
Property Changed:
----------------
branches/resourceloader/phase3/maintenance/tests/phpunit
Modified: branches/resourceloader/phase3/maintenance/tests/phpunit
===================================================================
--- branches/resourceloader/phase3/maintenance/tests/phpunit 2010-09-03
01:16:05 UTC (rev 72255)
+++ branches/resourceloader/phase3/maintenance/tests/phpunit 2010-09-03
02:14:51 UTC (rev 72256)
@@ -2,7 +2,14 @@
<?php
require( dirname( __FILE__ ) . '/../commandLine.inc' );
-require_once 'PHPUnit/Autoload.php';
+// XXX: This can go away if everyone switches to PHPUnit 3.5
+if ( @file_get_contents( 'PHPUnit/Autoload.php', true ) !== false ) {
+ // Works for PHPUnit >= 3.5
+ require_once 'PHPUnit/Autoload.php';
+} else {
+ // Works for PHPUnit < 3.5
+ require_once 'PHPUnit/TextUI/Command.php';
+}
define( 'MW_PHPUNIT_TEST', 1 );
$wgLocaltimezone = 'UTC';
Property changes on: branches/resourceloader/phase3/maintenance/tests/phpunit
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/maintenance/tests/phpunit:51646
/branches/new-installer/phase3/maintenance/tests/phpunit:43664-66004
/branches/sqlite/maintenance/tests/phpunit:58211-58321
/trunk/phase3/maintenance/tests/phpunit:68366-72255
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
