diff options
| author | sgiehl <stefan@piwik.org> | 2014-05-30 01:48:56 +0400 |
|---|---|---|
| committer | sgiehl <stefan@piwik.org> | 2014-05-30 01:48:56 +0400 |
| commit | f85f7d61d9a398b812920c6121461d518349e21a (patch) | |
| tree | 6c2d61f10bcfaa4babc7e230433a15f96827bb1b /tests/PHPUnit/bootstrap.php | |
| parent | b826190f10c4cad57b542e8634f3bce0607aba42 (diff) | |
reimplemented caching; fixed detection of BOT 'os'
Diffstat (limited to 'tests/PHPUnit/bootstrap.php')
| -rw-r--r-- | tests/PHPUnit/bootstrap.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/PHPUnit/bootstrap.php b/tests/PHPUnit/bootstrap.php index 1dcb995b0e..c951e4a3c6 100644 --- a/tests/PHPUnit/bootstrap.php +++ b/tests/PHPUnit/bootstrap.php @@ -27,6 +27,9 @@ if (!defined('PIWIK_INCLUDE_SEARCH_PATH')) { error_reporting(E_ALL | E_NOTICE); @date_default_timezone_set('UTC'); +require_once file_exists(PIWIK_INCLUDE_PATH . '/vendor/autoload.php') + ? PIWIK_INCLUDE_PATH . '/vendor/autoload.php' // Piwik is the main project + : PIWIK_INCLUDE_PATH . '/../../autoload.php'; // Piwik is installed as a dependency require_once PIWIK_INCLUDE_PATH . '/libs/upgradephp/upgrade.php'; require_once PIWIK_INCLUDE_PATH . '/core/testMinimumPhpVersion.php'; @@ -37,9 +40,6 @@ require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/IntegrationTestCase.php'; require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/FakeAccess.php'; require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/MockPiwikOption.php'; require_once PIWIK_INCLUDE_PATH . '/tests/PHPUnit/TestingEnvironment.php'; -require_once file_exists(PIWIK_INCLUDE_PATH . '/vendor/autoload.php') - ? PIWIK_INCLUDE_PATH . '/vendor/autoload.php' // Piwik is the main project - : PIWIK_INCLUDE_PATH . '/../../autoload.php'; // Piwik is installed as a dependency \Piwik\Profiler::setupProfilerXHProf( $mainRun = true ); |