diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2015-10-19 23:02:52 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2015-10-19 23:02:52 +0200 |
| commit | 03e1e88db1a4451ed111b6854805bc801a83c9b8 (patch) | |
| tree | 67c7d8b0e1f964c1135d25b281145ef71193219e /travis | |
| parent | 26e5429f721b40d6d721fa9e2e2ede5f6222798c (diff) | |
| parent | 395ef4efb72aab6a660612be4632794f00991d85 (diff) | |
| download | php-git-03e1e88db1a4451ed111b6854805bc801a83c9b8.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fixup, both catched by nikic
use another character device in this test as /dev/console seems that it is different for lxc containers
the de_DE(iso-8859-1) locale is not available on ubuntu by default, but there is no reason to require that over the utf-8 one
let's try running our testsuite without sudo
Diffstat (limited to 'travis')
| -rwxr-xr-x | travis/compile.sh | 6 | ||||
| -rw-r--r-- | travis/de | 2 | ||||
| -rwxr-xr-x | travis/ext/curl/setup.sh | 6 | ||||
| -rwxr-xr-x | travis/install.sh | 2 |
4 files changed, 7 insertions, 9 deletions
diff --git a/travis/compile.sh b/travis/compile.sh index 6065c1df57..346460c874 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-phpdbg \ @@ -61,4 +63,4 @@ $TS \ --with-kerberos \ --enable-sysvmsg make -j2 --quiet -sudo make install +make install diff --git a/travis/de b/travis/de deleted file mode 100644 index ae49d969ee..0000000000 --- a/travis/de +++ /dev/null @@ -1,2 +0,0 @@ -de_DE.UTF-8 UTF-8 -de_DE ISO-8859-1 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 |