Make start-local-server not depend on BrowserStack and improve loggin…

…g of nginx server Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · May 13, 2020 · ee2a49e · ee2a49e
1 parent c5d4469
commit ee2a49e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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