diff options
author | Mark Pemberton <mpemberton5@gmail.com> | 2011-05-21 21:38:25 -0400 |
---|---|---|
committer | Mark Pemberton <mpemberton5@gmail.com> | 2011-05-21 21:38:25 -0400 |
commit | b105867e75f103ae2b0c54edfaa9ce6467a8a258 (patch) | |
tree | 299bd99f271a55a98de88e8b27e457ea8401d2f1 /tests/prepare.php | |
parent | e0149e24e2b5fac3b875fda468b18fbe2b6b1218 (diff) | |
parent | 97bba97049eeed2ecec022caa641b50ca507cb72 (diff) | |
download | semanticscuttle-b105867e75f103ae2b0c54edfaa9ce6467a8a258.tar.gz semanticscuttle-b105867e75f103ae2b0c54edfaa9ce6467a8a258.tar.bz2 |
Merge branch 'master' into privatekey2
Diffstat (limited to 'tests/prepare.php')
-rw-r--r-- | tests/prepare.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/prepare.php b/tests/prepare.php index c80306e..ea4d77d 100644 --- a/tests/prepare.php +++ b/tests/prepare.php @@ -22,7 +22,7 @@ $_SERVER['HTTP_HOST'] = 'http://localhost/'; define('UNIT_TEST_MODE', true); if ('@data_dir@' == '@' . 'data_dir@') { - //non pear-install + //non pear-installation (i.e. git checkout) require_once dirname(__FILE__) . '/../src/SemanticScuttle/header.php'; } else { //pear installation; files are in include path @@ -35,7 +35,7 @@ if ($GLOBALS['debugMode'] == true && $GLOBALS['dbtype'] == 'mysql4' ) { echo "\n" - . '!!! The combination of debugMode and dbtype==mysql4' + . '!! The combination of debugMode and dbtype==mysql4' . ' will wreck some tests' . "\n\n"; } ?>
\ No newline at end of file |