L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-49840-master' of git://github.com/andrewnicols/moodle

Browse Source
This commit is contained in:
David Monllao
2015-05-01 11:05:59 +08:00
parent 04cb1103a6 a910e3885a
commit 600596fd6a
5 changed files with 1764 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/tool/behat/cli/init.php
+2 -14
View File
@@ -99,25 +99,13 @@ if ($options['parallel'] && $options['parallel'] > 1) {
$cwd = getcwd();
$output = null;
$installcomposer = true;
// If behat dependencies not downloaded then do it first, else symfony/process can't be used.
if ($options['parallel'] && !file_exists(__DIR__ . "/../../../../vendor/autoload.php")) {
$installcomposer = false;
testing_update_composer_dependencies();
}
testing_update_composer_dependencies();
// Check whether the behat test environment needs to be updated.
chdir(__DIR__);
exec("php $utilfile --diag $paralleloption", $output, $code);
// Check if composer needs to be updated.
if ($installcomposer &&
($code == BEHAT_EXITCODE_INSTALL || $code == BEHAT_EXITCODE_REINSTALL || $code == BEHAT_EXITCODE_COMPOSER)) {
testing_update_composer_dependencies();
// Check again for behat test site and see if it's install or re-install.
chdir(__DIR__);
exec("php $utilfile --diag $paralleloption", $output, $code);
}
if ($code == 0) {
echo "Behat test environment already installed\n";