diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-03-20 11:36:02 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-03-20 11:36:02 +0100 |
| commit | a87cc90d1e7380a58bc4a60bd4cc1894ec41c33b (patch) | |
| tree | c1bc3e439f7c407ed001d260a1bbb825a2c8c6f3 /tests | |
| parent | cce303ff5ca830990e8565f81a4c12dd053adf03 (diff) | |
| parent | 4a13a84cab8d775386fbc26534b009aa42ee79f9 (diff) | |
| download | nextcloud-server-a87cc90d1e7380a58bc4a60bd4cc1894ec41c33b.tar.gz nextcloud-server-a87cc90d1e7380a58bc4a60bd4cc1894ec41c33b.zip | |
Merge pull request #14993 from owncloud/stop-on-missing-deps
Stop executing, when 3rdparty is missing or apps directory is invalid
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/preseed-config.php | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/tests/preseed-config.php b/tests/preseed-config.php index 3f41573bf29..e2c5a55fa58 100644 --- a/tests/preseed-config.php +++ b/tests/preseed-config.php @@ -1,23 +1,23 @@ <?php -$CONFIG = array ( - "appstoreenabled" => false, - 'apps_paths' => - array ( - 0 => - array ( - 'path' => OC::$SERVERROOT.'/apps', - 'url' => '/apps', - 'writable' => true, - ), - 1 => - array ( - 'path' => OC::$SERVERROOT.'/apps2', - 'url' => '/apps2', - 'writable' => false, - ) - ), -); +$CONFIG = [ + 'appstoreenabled' => false, + 'apps_paths' => [ + [ + 'path' => OC::$SERVERROOT . '/apps', + 'url' => '/apps', + 'writable' => true, + ], + ], +]; -if(substr(strtolower(PHP_OS), 0, 3) == "win") { - $CONFIG['openssl'] = array( 'config' => OC::$SERVERROOT.'/tests/data/openssl.cnf'); +if (is_dir(OC::$SERVERROOT.'/apps2')) { + $CONFIG['apps_paths'][] = [ + 'path' => OC::$SERVERROOT . '/apps2', + 'url' => '/apps2', + 'writable' => false, + ]; +} + +if (substr(strtolower(PHP_OS), 0, 3) === 'win') { + $CONFIG['openssl'] = ['config' => OC::$SERVERROOT . '/tests/data/openssl.cnf']; } |