diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2013-11-28 03:21:04 +0400 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2013-11-28 03:21:04 +0400 |
| commit | 8b1a412e5933d648a09f64b362bfe9c953e272d3 (patch) | |
| tree | 1c0ca286287542691fbb3e8cdc3790cb1b804e36 /tests/travis | |
| parent | be0cc5686366c8c6b3009821ebcf53dfa9231818 (diff) | |
make sure the PHP-FPM log can be created in piwik, piwik-ui-tests and piwik-tests-plugins
Diffstat (limited to 'tests/travis')
| -rwxr-xr-x | tests/travis/setup_webserver.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/travis/setup_webserver.sh b/tests/travis/setup_webserver.sh index 313b0a41af..2d3264bc68 100755 --- a/tests/travis/setup_webserver.sh +++ b/tests/travis/setup_webserver.sh @@ -14,7 +14,14 @@ echo "Configuring php-fpm" PHP_FPM_BIN="$HOME/.phpenv/versions/$TRAVIS_PHP_VERSION/sbin/php-fpm" PHP_FPM_CONF="$DIR/php-fpm.conf" PHP_FPM_SOCK=$(realpath "$DIR")/php-fpm.sock -PHP_FPM_LOG="$TRAVIS_BUILD_DIR/../piwik/tmp/php-fpm.log" + +if [ -d "$TRAVIS_BUILD_DIR/../piwik/tmp/" ]; then + PHP_FPM_LOG="$TRAVIS_BUILD_DIR/../piwik/tmp/php-fpm.log" +elif [ -d "$TRAVIS_BUILD_DIR/piwik/tmp/" ]; then + PHP_FPM_LOG="$TRAVIS_BUILD_DIR/piwik/tmp/php-fpm.log" +else + PHP_FPM_LOG="$TRAVIS_BUILD_DIR/php-fpm.log" +fi USER=$(whoami) |