com php-src: Merge branch 'PHP-5.5' into PHP-5.6: .travis.yml ext/intl/tests/bug67052.phpt travis/compile.sh

From: Date: Mon, 19 Oct 2015 20:47:23 +0000
Subject: com php-src: Merge branch 'PHP-5.5' into PHP-5.6: .travis.yml ext/intl/tests/bug67052.phpt travis/compile.sh
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-89465@lists.php.net to get a copy of this message
Commit: 395ef4efb72aab6a660612be4632794f00991d85 Author: Ferenc Kovacs <tyrael@php.net> Mon, 19 Oct 2015 22:47:23 +0200 Parents: 0b35e0c5a120c9ff98dad7e44259f26ca828a8e4 f3838a9c3561022cfeeb649093e4fdec715d39b0 Branches: PHP-5.6 Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=395ef4efb72aab6a660612be4632794f00991d85 Log: Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: 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 ext/intl/tests/bug67052.phpt MM travis/compile.sh Diff: diff --cc .travis.yml index 658548b,e6eec4c..c13009a --- a/.travis.yml +++ b/.travis.yml @@@ -1,5 -1,15 +1,20 @@@ 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 + notifications: email: on_failure: change diff --cc travis/compile.sh index 4dce7fc,682d5d8..fa0a2fc --- a/travis/compile.sh +++ b/travis/compile.sh @@@ -48,14 -50,6 +50,14 @@@ $TS --with-bz2 \ --with-openssl \ --with-gmp \ ---enable-bcmath +--enable-bcmath \ +--enable-phpdbg \ +--enable-calendar \ +--enable-ftp \ +--with-pspell=/usr \ +--with-recode=/usr \ +--with-enchant=/usr \ +--enable-wddx \ +--enable-sysvmsg make -j2 --quiet - sudo make install + make install

« previous php.cvs (#89465) next »