From 03bafe99fe982dbff7adc9e7ef04c55ec3a32fcb Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Thu, 19 Feb 2015 17:22:14 +0200
Subject: Revert last commit & just ignore E_DEPRECATED

---
 .travis.yml                            | 4 ----
 tests/codeigniter/database/DB_test.php | 8 ++++++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c98b45efb..4f560442b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,10 +31,6 @@ matrix:
   allow_failures:
     - php: 5.2
     - php: hhvm
-    - php: 5.5
-      env: DB=mysql
-    - php: 5.6
-      env: DB=mysql
   exclude:
     - php: hhvm
       env: DB=pgsql
diff --git a/tests/codeigniter/database/DB_test.php b/tests/codeigniter/database/DB_test.php
index d5a9369e6..dc4fae986 100644
--- a/tests/codeigniter/database/DB_test.php
+++ b/tests/codeigniter/database/DB_test.php
@@ -26,6 +26,14 @@ class DB_test extends CI_TestCase {
 	{
 		$config = Mock_Database_DB::config(DB_DRIVER);
 		$connection = new Mock_Database_DB($config);
+
+		// E_DEPRECATED notices thrown by mysql_connect(), mysql_pconnect()
+		// on PHP 5.5+ cause the tests to fail
+		if (DB_DRIVER === 'mysql' && version_compare(PHP_VERSION, '5.5', '>='))
+		{
+			error_reporting(E_ALL & ~E_DEPRECATED);
+		}
+
 		$db = Mock_Database_DB::DB($connection->set_dsn(DB_DRIVER), TRUE);
 
 		$this->assertTrue($db instanceof CI_DB);
-- 
cgit v1.2.3-24-g4f1b