diff options
| author | William Desportes <williamdes@wdes.fr> | 2020-05-12 00:26:59 +0300 |
|---|---|---|
| committer | William Desportes <williamdes@wdes.fr> | 2020-05-13 23:28:46 +0300 |
| commit | ee2a49e4a81b9a854b3ca5d71a178e94a9ce643f (patch) | |
| tree | e8cbf4b13c1b3a21fde8a7cefb41c15fb65cdc7a /test | |
| parent | c5d44692a480deeebb93e3241c61f82830acb23e (diff) | |
Make start-local-server not depend on BrowserStack and improve logging of nginx server
Signed-off-by: William Desportes <williamdes@wdes.fr>
Diffstat (limited to 'test')
| -rw-r--r-- | test/nginx.conf | 2 | ||||
| -rwxr-xr-x | test/start-local-server | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/test/nginx.conf b/test/nginx.conf index f37fd24b1d..f7f7e68cdd 100644 --- a/test/nginx.conf +++ b/test/nginx.conf @@ -49,6 +49,8 @@ http { access_log off; server { + access_log %ROOT%/nginx-access.log; + error_log %ROOT%/nginx-error.log error; listen 8000 default_server; server_name _; diff --git a/test/start-local-server b/test/start-local-server index 08f9f4eb32..31482a885d 100755 --- a/test/start-local-server +++ b/test/start-local-server @@ -9,7 +9,7 @@ fi set -e set -x -if [ "$CI_MODE" != "selenium" -o -z "$TESTSUITE_BROWSERSTACK_KEY" ] ; then +if [ "$CI_MODE" != "selenium" ] ; then exit 0 fi @@ -27,5 +27,7 @@ mkdir $DIR/sessions $HOME/.phpenv/versions/$PHP_VERSION/sbin/php-fpm --fpm-config $DIR/php-fpm.conf -c $DIR/php.ini nginx -c $DIR/nginx.conf -# Start BrowserStack Local forwarder -~/browserstack/BrowserStackLocal --force-local --localIdentifier "travis-$TRAVIS_JOB_NUMBER" --onlyAutomate --key "$TESTSUITE_BROWSERSTACK_KEY" --daemon start +if [ ! -z "$TESTSUITE_BROWSERSTACK_KEY" ] ; then + # Start BrowserStack Local forwarder + ~/browserstack/BrowserStackLocal --force-local --localIdentifier "travis-$TRAVIS_JOB_NUMBER" --onlyAutomate --key "$TESTSUITE_BROWSERSTACK_KEY" --daemon start +fi |