From cfc49a6883490a3c6d30bbc9c4ff8ecbd6af7eb0 Mon Sep 17 00:00:00 2001 From: Antoine Musso Date: Sat, 13 Nov 2010 12:45:10 +0000 Subject: [PATCH] With PHPUnit 3.5.0, use its autoloader (like r74831). Fix 'make test' for me. --- includes/normal/CleanUpTest.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/includes/normal/CleanUpTest.php b/includes/normal/CleanUpTest.php index bc5107d78a..549a04062e 100644 --- a/includes/normal/CleanUpTest.php +++ b/includes/normal/CleanUpTest.php @@ -36,7 +36,14 @@ if( isset( $_SERVER['argv'] ) && in_array( '--icu', $_SERVER['argv'] ) ) { #ini_set( 'memory_limit', '40M' ); -require_once 'PHPUnit/Framework.php'; +require_once( 'PHPUnit/Runner/Version.php' ); +if( version_compare( PHPUnit_Runner_Version::id(), '3.5.0', '>=' ) ) { + # PHPUnit 3.5.0 introduced a nice autoloader based on class name + require_once( 'PHPUnit/Autoload.php' ); +} else { + # Keep the old pre PHPUnit 3.5.0 behaviour for compatibility + require_once 'PHPUnit/Framework.php'; +} require_once 'PHPUnit/TextUI/TestRunner.php'; require_once 'UtfNormal.php'; -- 2.20.1