From 94a94c05c1494c77930ddfec8cb696b3f99fa178 Mon Sep 17 00:00:00 2001 From: Chirayu Chiripal Date: Sun, 7 Dec 2014 03:45:36 +0530 Subject: [PATCH 1/2] fix tests for HHVM Signed-off-by: Chirayu Chiripal --- test/libraries/PMA_operations_test.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/libraries/PMA_operations_test.php b/test/libraries/PMA_operations_test.php index 0f49a5568f..5027347e0c 100644 --- a/test/libraries/PMA_operations_test.php +++ b/test/libraries/PMA_operations_test.php @@ -98,7 +98,7 @@ class PMA_Operations_Test extends PHPUnit_Framework_TestCase $_REQUEST['db_collation'] = 'db1'; $this->assertRegExp( - '/.*db_operations.php(.|[\n])*db_copy([\n]|.)*Copy database to.*/m', + '/.*db_operations.php.*db_copy.*Copy database to.*/ms', PMA_getHtmlForCopyDatabase("pma") ); } @@ -211,7 +211,7 @@ class PMA_Operations_Test extends PHPUnit_Framework_TestCase { $this->assertRegExp( - '/.*action="tbl_operations.php"(.|[\n])*ANALYZE([\n]|.)*REBUILD([\n]|.)*/m', + '/.*action="tbl_operations.php".*ANALYZE.*REBUILD.*/ms', PMA_getHtmlForPartitionMaintenance( array("partition1", "partion2"), array("param1" => 'foo', "param2" => 'bar') From b8e698e22f94bc8c6c1083366d5457e8dcf8b070 Mon Sep 17 00:00:00 2001 From: Chirayu Chiripal Date: Sun, 7 Dec 2014 13:58:26 +0530 Subject: [PATCH 2/2] remove HHVM from allowed failures Signed-off-by: Chirayu Chiripal --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1cc4969027..5606c368ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,7 +36,7 @@ before_script: git clone --depth=1 git://github.com/zenovich/runkit.git ; cd runkit ; if [[ $TRAVIS_PHP_VERSION = "5.6" ]] ; then - wget https://github.com/zenovich/runkit/pull/71.diff ; + wget https://github.com/zenovich/runkit/pull/71.diff ; patch -p1 < 71.diff ; fi ; phpize ; @@ -89,8 +89,6 @@ matrix: allow_failures: - php: 5.5 env: PHPUNIT_ARGS="--group selenium" SELENIUM="yes" - - php: hhvm - env: PHPUNIT_ARGS="--exclude-group selenium" fast_finish: true include: - php: 5.5