From 1317d671700daaa900dd0f8f13d0e2e3eab2448e Mon Sep 17 00:00:00 2001
From: v-kaywon <v-kaywon@microsoft.com>
Date: Wed, 1 Nov 2017 17:24:17 -0700
Subject: [PATCH] remove xfail from pdostatement_nextRowset.phpt

---
 test/functional/pdo_sqlsrv/PDO11_Drivers.phpt |   2 +-
 .../pdo_sqlsrv/pdo_query_timeout.phpt         |  36 +++++++++---------
 .../pdo_sqlsrv/pdostatement_nextRowset.phpt   | Bin 10845 -> 10727 bytes
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/test/functional/pdo_sqlsrv/PDO11_Drivers.phpt b/test/functional/pdo_sqlsrv/PDO11_Drivers.phpt
index 5353a5f3..3756f851 100644
--- a/test/functional/pdo_sqlsrv/PDO11_Drivers.phpt
+++ b/test/functional/pdo_sqlsrv/PDO11_Drivers.phpt
@@ -1,7 +1,7 @@
 --TEST--
 PDO Drivers Info Test
 --DESCRIPTION--
-Verifies the functionality of "PDO:getAvailableDrivers()�.
+Verifies the functionality of "PDO:getAvailableDrivers()".
 --ENV--
 PHPT_EXEC=true
 --SKIPIF--
diff --git a/test/functional/pdo_sqlsrv/pdo_query_timeout.phpt b/test/functional/pdo_sqlsrv/pdo_query_timeout.phpt
index 16b86354..8e5e1ce4 100644
--- a/test/functional/pdo_sqlsrv/pdo_query_timeout.phpt
+++ b/test/functional/pdo_sqlsrv/pdo_query_timeout.phpt
@@ -44,24 +44,24 @@ try {
 }
 echo "Done\n";
 ?>
---EXPECT--
-Starting test...
+--EXPECTREGEX--
+Starting test\.\.\.
 Setting query timeout as an attribute in connection
-array(3) {
-  [0]=>
-  string(5) "HYT00"
-  [1]=>
-  int(0)
-  [2]=>
-  string(63) "[Microsoft][ODBC Driver 13 for SQL Server]Query timeout expired"
-}
+array\(3\) \{
+  \[0\]=>
+  string\(5\) \"HYT00\"
+  \[1\]=>
+  int\(0\)
+  \[2\]=>
+  string\(63\) \"\[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]Query timeout expired\"
+\}
 Setting query timeout in the statement
-array(3) {
-  [0]=>
-  string(5) "HYT00"
-  [1]=>
-  int(0)
-  [2]=>
-  string(63) "[Microsoft][ODBC Driver 13 for SQL Server]Query timeout expired"
-}
+array\(3\) \{
+  \[0\]=>
+  string\(5\) \"HYT00\"
+  \[1\]=>
+  int\(0\)
+  \[2\]=>
+  string\(63\) \"\[Microsoft\]\[ODBC Driver 1[1-9] for SQL Server\]Query timeout expired\"
+\}
 Done
diff --git a/test/functional/pdo_sqlsrv/pdostatement_nextRowset.phpt b/test/functional/pdo_sqlsrv/pdostatement_nextRowset.phpt
index 7cf0bc41f833176cfd8987539a94597ea283217e..339880bc800bb4a44bf279f260aa22f0b8f210a8 100644
GIT binary patch
delta 12
TcmcZ`@;rFMU#88)%&*h{ExHC&

delta 140
zcmaDJd^cpnU#9v9H%Ct&U0p7x(sYIL%#sX+<ouk{+&qQUyyT+Ff|AVqJS&Bu)RLmi
z)UwRHbcNi+3Ydz-w35^!h2+GX9FRm_YI#t8d2woqhNePMYDsBPUa>-Per~EldSX#h
hVtT4Vaz<iNVlq%mF_*5cYeayna|qDd&1}pM)c~qfGXVeq