Revert "allow running all core test cases via the console"

This reverts commit 86e5cc5.
cakephp · Aug 2, 2009 · 9e4cb97 · 9e4cb97
1 parent 292b37c
commit 9e4cb97
Showing 1 changed file with 4 additions and 13 deletions.
diff --git a/cake/console/libs/testsuite.php b/cake/console/libs/testsuite.php
@@ -94,7 +94,7 @@ function initialize() {
 		if (isset($corePath[0])) {
 			define('TEST_CAKE_CORE_INCLUDE_PATH', rtrim($corePath[0], DS) . DS);
 		} else {
-			define('TEST_CAKE_CORE_INCLUDE_PATH', CAKE_CORE_INCLUDE_PATH . DS . 'cake' . DS);
+			define('TEST_CAKE_CORE_INCLUDE_PATH', CAKE_CORE_INCLUDE_PATH);
 		}
 
 		$this->__installSimpleTest();
@@ -236,13 +236,8 @@ function __canRun() {
 					return true;
 				}
 
-				if ($this->category == 'core') {
-					if (file_exists($folder.DS.'cases'.DS.$this->file.'.test.php')) {
-						return true;
-					}
-					if (file_exists($folder.DS.'cases'.DS.'libs'.DS.$this->file.'.test.php')) {
-						return true;
-					}
+				if ($this->category == 'core' && file_exists($folder.DS.'cases'.DS.'libs'.DS.$this->file.'.test.php')) {
+					return true;
 				}
 
 				if ($isPlugin && file_exists($folder.DS.'cases'.DS.$this->file.'.test.php')) {
@@ -297,11 +292,7 @@ function __run() {
 			return $result;
 		}
 
-		if (file_exists(CORE_TEST_CASES . DS . $this->file . '.test.php')) {
-			$case = $this->file . '.test.php';
-		} else {
-			$case = 'libs' . DS . $this->file . '.test.php';
-		}
+		$case = 'libs'.DS.$this->file.'.test.php';
 		if ($this->category == 'app') {
 			$case = $this->file.'.test.php';
 		} elseif ($this->isPluginTest) {