Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Desportes <williamdes@wdes.fr>2020-05-12 00:26:59 +0300
committerWilliam Desportes <williamdes@wdes.fr>2020-05-13 23:28:46 +0300
commitee2a49e4a81b9a854b3ca5d71a178e94a9ce643f (patch)
treee8cbf4b13c1b3a21fde8a7cefb41c15fb65cdc7a /test/start-local-server
parentc5d44692a480deeebb93e3241c61f82830acb23e (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/start-local-server')
-rwxr-xr-xtest/start-local-server8
1 files changed, 5 insertions, 3 deletions
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