From 6f00b28a1d9c7409c956a83866eac48a9493e83c Mon Sep 17 00:00:00 2001
From: "ctrlaltca@gmail.com" <>
Date: Sat, 21 May 2011 17:10:29 +0000
Subject: branch/3.1: merged bugfixesfrom trunk/ up to r2880; correct
 svn:mergeinfo property

---
 tests/unit/phpunit.php | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'tests')

diff --git a/tests/unit/phpunit.php b/tests/unit/phpunit.php
index 8395c7a0..6d612e46 100644
--- a/tests/unit/phpunit.php
+++ b/tests/unit/phpunit.php
@@ -15,9 +15,21 @@ set_include_path(PRADO_FRAMEWORK_DIR.PATH_SEPARATOR.get_include_path());
 
 require_once dirname(__FILE__).'/Prado.php';
 require_once PRADO_FRAMEWORK_DIR.'/prado.php';
-require_once 'PHPUnit/Framework/TestCase.php';
-require_once 'PHPUnit/Framework/IncompleteTestError.php';
-require_once 'PHPUnit/Framework/TestSuite.php';
+
+//grab the version of phpunit, OPP: phpunit provided version call
+$version = `{$_SERVER['argv'][0]} --version`;
+preg_match('/(\d\d?)\.(\d\d?)(\.(\d\d?))?/', $version, $matches);
+
+if($matches[1] <= 3){
+	if($matches[2] <= 4){
+		require_once 'PHPUnit/Framework.php';
+		if($matches[2] <= 3){
+			require_once 'PHPUnit/Framework/TestCase.php';
+			require_once 'PHPUnit/Framework/IncompleteTestError.php';
+			require_once 'PHPUnit/Framework/TestSuite.php';
+		}
+	}
+}
 require_once 'PHPUnit/TextUI/TestRunner.php';
 require_once 'PHPUnit/Util/Filter.php';
 ?>
-- 
cgit v1.2.3