diff --git a/test/AllTests.php b/test/AllTests.php index 4f8e126fe4..77b59cf01d 100644 --- a/test/AllTests.php +++ b/test/AllTests.php @@ -1,38 +1,5 @@ addPath(ONPHP_TEST_PATH.'misc'); - - $testPathes = array( - ONPHP_TEST_PATH.'core'.DIRECTORY_SEPARATOR, - ONPHP_TEST_PATH.'main'.DIRECTORY_SEPARATOR, - ONPHP_TEST_PATH.'main'.DIRECTORY_SEPARATOR.'Autoloader'.DIRECTORY_SEPARATOR, - ONPHP_TEST_PATH.'main'.DIRECTORY_SEPARATOR.'Ip'.DIRECTORY_SEPARATOR, - ONPHP_TEST_PATH.'main'.DIRECTORY_SEPARATOR.'Net'.DIRECTORY_SEPARATOR, - ONPHP_TEST_PATH.'main'.DIRECTORY_SEPARATOR.'Utils'.DIRECTORY_SEPARATOR, - ONPHP_TEST_PATH.'main'.DIRECTORY_SEPARATOR.'Utils'.DIRECTORY_SEPARATOR.'Routers'.DIRECTORY_SEPARATOR, - ONPHP_TEST_PATH.'main'.DIRECTORY_SEPARATOR.'Utils'.DIRECTORY_SEPARATOR.'AMQP'.DIRECTORY_SEPARATOR, - ONPHP_TEST_PATH.'db'.DIRECTORY_SEPARATOR, - ); - + $config = dirname(__FILE__).'/config.inc.php'; include is_readable($config) ? $config : $config.'.tpl'; @@ -131,4 +98,3 @@ public static function suite() AllTests::$dbs = $dbs; AllTests::$paths = $testPathes; AllTests::$workers = $daoWorkers; -?> \ No newline at end of file diff --git a/test/config.inc.php.tpl b/test/config.inc.php.tpl index 683dee0bf6..181fff660b 100644 --- a/test/config.inc.php.tpl +++ b/test/config.inc.php.tpl @@ -1,5 +1,33 @@ addPath(ONPHP_TEST_PATH.'misc'); + + $testPathes = array( + ONPHP_TEST_PATH.'core'.DIRECTORY_SEPARATOR, + ONPHP_TEST_PATH.'main'.DIRECTORY_SEPARATOR, + ONPHP_TEST_PATH.'main'.DIRECTORY_SEPARATOR.'Autoloader'.DIRECTORY_SEPARATOR, + ONPHP_TEST_PATH.'main'.DIRECTORY_SEPARATOR.'Ip'.DIRECTORY_SEPARATOR, + ONPHP_TEST_PATH.'main'.DIRECTORY_SEPARATOR.'Net'.DIRECTORY_SEPARATOR, + ONPHP_TEST_PATH.'main'.DIRECTORY_SEPARATOR.'Utils'.DIRECTORY_SEPARATOR, + ONPHP_TEST_PATH.'main'.DIRECTORY_SEPARATOR.'Utils'.DIRECTORY_SEPARATOR.'Routers'.DIRECTORY_SEPARATOR, + ONPHP_TEST_PATH.'main'.DIRECTORY_SEPARATOR.'Utils'.DIRECTORY_SEPARATOR.'AMQP'.DIRECTORY_SEPARATOR, + ONPHP_TEST_PATH.'db'.DIRECTORY_SEPARATOR, + ); + $dbs = array( 'PgSQL' => array( 'user' => 'onphp', @@ -30,4 +58,3 @@ define('__LOCAL_DEBUG__', true); define('ONPHP_CURL_TEST_URL', 'http://localhost/curlTest.php'); //set here url to test script test/main/data/curlTest/curlTest.php -?>