com php-src: Merge branch 'PHP-5.6' into PHP-7.0: .travis.yml travis/compile.sh
| From: | Ferenc Kovacs | Date: | Mon, 19 Oct 2015 21:02:52 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' into PHP-7.0: .travis.yml travis/compile.sh | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89466@lists.php.net to get a copy of this message | ||
Commit: 03e1e88db1a4451ed111b6854805bc801a83c9b8
Author: Ferenc Kovacs <tyrael@php.net> Mon, 19 Oct 2015 23:02:52 +0200
Parents: 26e5429f721b40d6d721fa9e2e2ede5f6222798c 395ef4efb72aab6a660612be4632794f00991d85
Branches: PHP-7.0
Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=03e1e88db1a4451ed111b6854805bc801a83c9b8
Log:
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
Changed paths:
MM .travis.yml
MM travis/compile.sh
Diff:
diff --cc .travis.yml
index 2e5a520,c13009a..292e87b
--- a/.travis.yml
+++ b/.travis.yml
@@@ -1,4 -1,19 +1,23 @@@
language: c
+ sudo: false
+ addons:
+ apt:
+ packages:
+ - locales
+ - language-pack-de
+ - re2c
+ - libgmp-dev
+ - libicu-dev
+ - libmcrypt-dev
+ - libtidy-dev
+ - libenchant-dev
+ - libaspell-dev
+ - libpspell-dev
+ - librecode-dev
++ - libsasl2-dev
++ - libxpm-dev
++ - libt1-dev
++ - libc-client2007e-dev
notifications:
email:
diff --cc travis/compile.sh
index 6065c1d,fa0a2fc..346460c
--- a/travis/compile.sh
+++ b/travis/compile.sh
@@@ -10,12 -10,14 +10,14 @@@ els
DEBUG="";
fi
./buildconf --force
- ./configure --quiet \
+ ./configure \
+ --prefix=$HOME"/php-install" \
+ --quiet \
$DEBUG \
$TS \
+--enable-phpdbg \
--enable-fpm \
--with-pdo-mysql=mysqlnd \
---with-mysql=mysqlnd \
--with-mysqli=mysqlnd \
--with-pgsql \
--with-pdo-pgsql \
@@@ -52,13 -54,10 +54,13 @@@
--enable-calendar \
--enable-ftp \
--with-pspell=/usr \
---with-recode=/usr \
--with-enchant=/usr \
--enable-wddx \
+--with-imap \
+--with-imap-ssl \
+--with-freetype-dir=/usr \
+--with-xpm-dir=/usr \
+--with-kerberos \
--enable-sysvmsg
make -j2 --quiet
- sudo make install
+ make install