Merge branch 'develop' into feature.diff-whitespace
This commit is contained in:
commit
473e9153ed
@ -21,7 +21,7 @@ if (file_exists($testconfig['db_database'])) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
echo ">>> creating empty test database...\n";
|
echo ">>> creating empty test database...\n";
|
||||||
passthru('php ' . PLUF_PATH . '/migrate.php --conf=' . TESTDIR . '/config.php -a -i');
|
passthru('php ' . escapeshellarg(PLUF_PATH.'/migrate.php') . ' --conf=' . escapeshellarg(TESTDIR.'/config.php').' -a -i');
|
||||||
|
|
||||||
echo ">>> setting up web application...\n";
|
echo ">>> setting up web application...\n";
|
||||||
require 'Pluf.php';
|
require 'Pluf.php';
|
||||||
|
Loading…
Reference in New Issue
Block a user