diff options
| author | Christian Weiske <cweiske@cweiske.de> | 2011-04-06 19:13:19 +0200 |
|---|---|---|
| committer | Christian Weiske <cweiske@cweiske.de> | 2011-04-06 19:13:19 +0200 |
| commit | 7379805565815c576723b888a20af080248222da (patch) | |
| tree | 498c98e8b6c43c2729349b7680c6a20efcfb98f3 /tests/prepare.php | |
| parent | 1e3cd8bf6ee636a5af692b57906612d6109849cb (diff) | |
| parent | 12c77161aca2c7d76fa5154fa1f4e214106d834b (diff) | |
| download | SemanticScuttle-origin/quickform.zip SemanticScuttle-origin/quickform.tar.gz SemanticScuttle-origin/quickform.tar.bz2 | |
Merge branch 'master' into quickformorigin/quickform
Conflicts:
data/templates/bookmarks.tpl.php
data/templates/sidebar.block.search.php
data/templates/top.inc.php
doc/developers/TODO
src/SemanticScuttle/header.php
Diffstat (limited to 'tests/prepare.php')
| -rw-r--r-- | tests/prepare.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/prepare.php b/tests/prepare.php index ce9cd1c..6afc284 100644 --- a/tests/prepare.php +++ b/tests/prepare.php @@ -19,7 +19,13 @@ $_SERVER['HTTP_HOST'] = 'http://localhost/'; define('UNIT_TEST_MODE', true); -require_once dirname(__FILE__) . '/../src/SemanticScuttle/header.php'; +if ('@data_dir@' == '@' . 'data_dir@') { + //non pear-install + require_once dirname(__FILE__) . '/../src/SemanticScuttle/header.php'; +} else { + //pear installation; files are in include path + require_once 'SemanticScuttle/header.php'; +} require_once dirname(__FILE__) . '/TestBase.php'; require_once dirname(__FILE__) . '/TestBaseApi.php'; |