mirror of
https://github.com/moodle/moodle.git
synced 2025-01-19 06:18:28 +01:00
MDL-37713 let phpunit bootstrap create test dataroot if necessary
This commit is contained in:
parent
b3778a0dec
commit
a07c89c632
@ -94,12 +94,8 @@ $CFG->filepermissions = ($CFG->directorypermissions & 0666);
|
|||||||
if (!isset($CFG->phpunit_dataroot)) {
|
if (!isset($CFG->phpunit_dataroot)) {
|
||||||
phpunit_bootstrap_error(PHPUNIT_EXITCODE_CONFIGERROR, 'Missing $CFG->phpunit_dataroot in config.php, can not run tests!');
|
phpunit_bootstrap_error(PHPUNIT_EXITCODE_CONFIGERROR, 'Missing $CFG->phpunit_dataroot in config.php, can not run tests!');
|
||||||
}
|
}
|
||||||
// Ensure we access to phpunit_dataroot realpath always.
|
|
||||||
$CFG->phpunit_dataroot = realpath($CFG->phpunit_dataroot);
|
|
||||||
|
|
||||||
if (isset($CFG->dataroot) and $CFG->phpunit_dataroot === $CFG->dataroot) {
|
// Create test dir if does not exists yet.
|
||||||
phpunit_bootstrap_error(PHPUNIT_EXITCODE_CONFIGERROR, '$CFG->dataroot and $CFG->phpunit_dataroot must not be identical, can not run tests!');
|
|
||||||
}
|
|
||||||
if (!file_exists($CFG->phpunit_dataroot)) {
|
if (!file_exists($CFG->phpunit_dataroot)) {
|
||||||
mkdir($CFG->phpunit_dataroot, $CFG->directorypermissions);
|
mkdir($CFG->phpunit_dataroot, $CFG->directorypermissions);
|
||||||
}
|
}
|
||||||
@ -107,6 +103,13 @@ if (!is_dir($CFG->phpunit_dataroot)) {
|
|||||||
phpunit_bootstrap_error(PHPUNIT_EXITCODE_CONFIGERROR, '$CFG->phpunit_dataroot directory can not be created, can not run tests!');
|
phpunit_bootstrap_error(PHPUNIT_EXITCODE_CONFIGERROR, '$CFG->phpunit_dataroot directory can not be created, can not run tests!');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Ensure we access to phpunit_dataroot realpath always.
|
||||||
|
$CFG->phpunit_dataroot = realpath($CFG->phpunit_dataroot);
|
||||||
|
|
||||||
|
if (isset($CFG->dataroot) and $CFG->phpunit_dataroot === $CFG->dataroot) {
|
||||||
|
phpunit_bootstrap_error(PHPUNIT_EXITCODE_CONFIGERROR, '$CFG->dataroot and $CFG->phpunit_dataroot must not be identical, can not run tests!');
|
||||||
|
}
|
||||||
|
|
||||||
if (!is_writable($CFG->phpunit_dataroot)) {
|
if (!is_writable($CFG->phpunit_dataroot)) {
|
||||||
// try to fix permissions if possible
|
// try to fix permissions if possible
|
||||||
if (function_exists('posix_getuid')) {
|
if (function_exists('posix_getuid')) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user