diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2015-08-23 22:47:51 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2015-08-23 22:47:51 +0200 |
| commit | 85d34c32642dbe75eaf27d0098e77005b45cbcba (patch) | |
| tree | dcab74404d8a6780cfdd6ccb287bec33c69e77dc | |
| parent | 15e9f4baf48f1a02091d1dbf505d9c6d561bc1d4 (diff) | |
| download | php-git-85d34c32642dbe75eaf27d0098e77005b45cbcba.tar.gz | |
let's try running our testsuite without sudo
| -rw-r--r-- | .travis.yml | 17 | ||||
| -rwxr-xr-x | travis/compile.sh | 6 | ||||
| -rwxr-xr-x | travis/ext/curl/setup.sh | 6 | ||||
| -rwxr-xr-x | travis/install.sh | 2 |
4 files changed, 18 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index 090f6cd2bc..e6eec4c45f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,15 @@ language: c - +sudo: false +addons: + apt: + packages: + - locales + - language-pack-de + - re2c + - libgmp-dev + - libicu-dev + - libmcrypt-dev + - libtidy-dev notifications: email: on_failure: change @@ -27,11 +37,6 @@ env: - ENABLE_MAINTAINER_ZTS=0 ENABLE_DEBUG=0 - ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1 -before_install: - - sudo cp ./travis/de /var/lib/locales/supported.d/de - - sudo dpkg-reconfigure locales - - ./travis/install.sh - before_script: # Compile PHP - ./travis/compile.sh diff --git a/travis/compile.sh b/travis/compile.sh index 039ed65cb9..682d5d8598 100755 --- a/travis/compile.sh +++ b/travis/compile.sh @@ -10,7 +10,9 @@ else DEBUG=""; fi ./buildconf --force -./configure --quiet \ +./configure \ +--prefix=$HOME"/php-install" \ +--quiet \ $DEBUG \ $TS \ --enable-fpm \ @@ -50,4 +52,4 @@ $TS \ --with-gmp \ --enable-bcmath make -j2 --quiet -sudo make install +make install diff --git a/travis/ext/curl/setup.sh b/travis/ext/curl/setup.sh index 74dad16eb3..02e8ce5bb8 100755 --- a/travis/ext/curl/setup.sh +++ b/travis/ext/curl/setup.sh @@ -1,5 +1,5 @@ #!/bin/bash -export PHP_CURL_HTTP_REMOTE_SERVER="http://localhost" +export PHP_CURL_HTTP_REMOTE_SERVER="http://localhost:8080" cd ./ext/curl/tests/responder -sudo php -S localhost:80 & -cd -
\ No newline at end of file +php -S localhost:8080 & +cd - diff --git a/travis/install.sh b/travis/install.sh deleted file mode 100755 index 5c6a3c1913..0000000000 --- a/travis/install.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -sudo apt-get install re2c libgmp-dev libicu-dev libmcrypt-dev libtidy-dev |