From 59036e15622243f7b68577233d0c1012a4b15f51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 6 Jan 2016 11:58:43 +0100
Subject: [PATCH] Simplify test to avoid need fo multiline regexp
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Cherry picked from master to avoid test suite failures on PHP 7.

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 test/libraries/PMA_operations_test.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/libraries/PMA_operations_test.php b/test/libraries/PMA_operations_test.php
index f8f122cdbe..55e15093e2 100644
--- a/test/libraries/PMA_operations_test.php
+++ b/test/libraries/PMA_operations_test.php
@@ -69,9 +69,11 @@ class PMA_Operations_Test extends PHPUnit_Framework_TestCase
     {
 
         $_REQUEST['db_collation'] = 'db1';
+        $html = PMA_getHtmlForRenameDatabase("pma");
+        $this->assertContains('db_operations.php', $html);
         $this->assertRegExp(
-            '/.*db_operations.php(.|[\n])*db_rename([\n]|.)*Rename database to.*/m',
-            PMA_getHtmlForRenameDatabase("pma")
+            '/.*db_rename.*Rename database to.*/',
+            $html
         );
     }