From 35d213c9ce1e9d1b974414c393c4a72f19eadbb4 Mon Sep 17 00:00:00 2001 From: Ferenc Kovacs Date: Sun, 27 Apr 2014 22:23:43 +0200 Subject: [PATCH 1/3] put this test back to XFAIL, as it was before, since it is still leaking memory --- ext/mbstring/tests/zend_multibyte-08.phpt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ext/mbstring/tests/zend_multibyte-08.phpt b/ext/mbstring/tests/zend_multibyte-08.phpt index 488e2a00caf8..a0989fc562a3 100644 --- a/ext/mbstring/tests/zend_multibyte-08.phpt +++ b/ext/mbstring/tests/zend_multibyte-08.phpt @@ -1,6 +1,8 @@ --TEST-- zend multibyte (8) --SKIPIF-- +--XFAIL-- +https://bugs.php.net/bug.php?id=66582 --INI-- zend.multibyte=On zend.script_encoding=ISO-8859-1 From 4cad8fcad2cd4dc965da8c03bacb6a25d293b7c1 Mon Sep 17 00:00:00 2001 From: Ferenc Kovacs Date: Sun, 27 Apr 2014 17:52:59 +0200 Subject: [PATCH 2/3] separate travis jobs for TS and NTS builds --- .travis.yml | 4 +++- travis/compile.sh | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 07653040dd9a..9cfb1e08580e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,8 +15,10 @@ env: - PDO_MYSQL_TEST_USER=travis - PDO_MYSQL_TEST_PASS= - PDO_MYSQL_TEST_HOST=127.0.0.1 - matrix: - REPORT_EXIT_STATUS=1 + matrix: + - ENABLE_MAINTAINER_ZTS=0 + - ENABLE_MAINTAINER_ZTS=1 before_script: # Compile PHP diff --git a/travis/compile.sh b/travis/compile.sh index eee3f9ad8931..85aca88df9e7 100755 --- a/travis/compile.sh +++ b/travis/compile.sh @@ -1,6 +1,12 @@ #!/bin/bash +if [[ "$ENABLE_MAINTAINER_ZTS" == 1 ]]; then + TS="--enable-maintainer-zts"; +else + TS=""; +fi ./buildconf ./configure --quiet \ +$TS \ --with-pdo-mysql=mysqlnd \ --with-mysql=mysqlnd \ --with-mysqli=mysqlnd \ From ea1d42641cb463e6d35959f8da5bbf1f9b9cb0ab Mon Sep 17 00:00:00 2001 From: Ferenc Kovacs Date: Mon, 28 Apr 2014 08:31:02 +0200 Subject: [PATCH 3/3] separate travis jobs for debug and non-debug builds --- .travis.yml | 6 ++++-- travis/compile.sh | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9cfb1e08580e..87a86956738e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,8 +17,10 @@ env: - PDO_MYSQL_TEST_HOST=127.0.0.1 - REPORT_EXIT_STATUS=1 matrix: - - ENABLE_MAINTAINER_ZTS=0 - - ENABLE_MAINTAINER_ZTS=1 + - ENABLE_MAINTAINER_ZTS=0 ENABLE_DEBUG=0 + - ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=0 + - ENABLE_MAINTAINER_ZTS=0 ENABLE_DEBUG=1 + - ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1 before_script: # Compile PHP diff --git a/travis/compile.sh b/travis/compile.sh index 85aca88df9e7..8b54b714ad3f 100755 --- a/travis/compile.sh +++ b/travis/compile.sh @@ -4,8 +4,14 @@ if [[ "$ENABLE_MAINTAINER_ZTS" == 1 ]]; then else TS=""; fi +if [[ "$ENABLE_DEBUG" == 1 ]]; then + DEBUG="--enable-debug"; +else + DEBUG=""; +fi ./buildconf ./configure --quiet \ +$DEBUG \ $TS \ --with-pdo-mysql=mysqlnd \ --with-mysql=mysqlnd \