From f1872d5abe238377a0619da3f0b686a3fec07116 Mon Sep 17 00:00:00 2001 From: yitam Date: Wed, 21 Jun 2017 14:33:19 -0700 Subject: [PATCH] made RC number optional --- test/bvt/pdo_sqlsrv/msdn_pdo_getAttribute.phpt | 2 +- test/bvt/sqlsrv/msdn_sqlsrv_client_info.phpt | 2 +- test/pdo_sqlsrv/pdo_getAttribute_clientInfo.phpt | 2 +- test/pdo_sqlsrv/pdo_get_set_attr.phpt | 2 +- test/sqlsrv/sqlsrv_client_info.phpt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/bvt/pdo_sqlsrv/msdn_pdo_getAttribute.phpt b/test/bvt/pdo_sqlsrv/msdn_pdo_getAttribute.phpt index 67038321..54aa2e80 100644 --- a/test/bvt/pdo_sqlsrv/msdn_pdo_getAttribute.phpt +++ b/test/bvt/pdo_sqlsrv/msdn_pdo_getAttribute.phpt @@ -35,5 +35,5 @@ Array \[DriverDllName\] => msodbcsql[0-9]{2}\.dll|libmsodbcsql-[0-9]{2}\.[0-9]\.so\.[0-9]\.[0-9] \[DriverODBCVer\] => [0-9]{1,2}\.[0-9]{1,2} \[DriverVer\] => [0-9]{1,2}\.[0-9]{1,2}\.[0-9]{4} - \[ExtensionVer\] => [0-9].[0-9]\.[0-9](-(RC[0-9]|preview))?(\.[0-9]+)?(\+[0-9]+)? + \[ExtensionVer\] => [0-9].[0-9]\.[0-9](-(RC[0-9]?|preview))?(\.[0-9]+)?(\+[0-9]+)? \) \ No newline at end of file diff --git a/test/bvt/sqlsrv/msdn_sqlsrv_client_info.phpt b/test/bvt/sqlsrv/msdn_sqlsrv_client_info.phpt index c07eceec..d9586d8d 100644 --- a/test/bvt/sqlsrv/msdn_sqlsrv_client_info.phpt +++ b/test/bvt/sqlsrv/msdn_sqlsrv_client_info.phpt @@ -32,4 +32,4 @@ sqlsrv_close( $conn); DriverDllName: msodbcsql[0-9]{2}\.dll|libmsodbcsql-[0-9]{2}\.[0-9]\.so\.[0-9]\.[0-9] DriverODBCVer: [0-9]{1,2}\.[0-9]{1,2} DriverVer: [0-9]{1,2}\.[0-9]{1,2}\.[0-9]{4} -ExtensionVer: [0-9].[0-9]\.[0-9](-(RC[0-9]|preview))?(\.[0-9]+)?(\+[0-9]+)? \ No newline at end of file +ExtensionVer: [0-9].[0-9]\.[0-9](-(RC[0-9]?|preview))?(\.[0-9]+)?(\+[0-9]+)? \ No newline at end of file diff --git a/test/pdo_sqlsrv/pdo_getAttribute_clientInfo.phpt b/test/pdo_sqlsrv/pdo_getAttribute_clientInfo.phpt index ca90d366..894721b8 100644 --- a/test/pdo_sqlsrv/pdo_getAttribute_clientInfo.phpt +++ b/test/pdo_sqlsrv/pdo_getAttribute_clientInfo.phpt @@ -18,5 +18,5 @@ Array \[(DriverDllName|DriverName)\] => (msodbcsql1[1-9].dll|libmsodbcsql-[1-9]{2}.[0-9].so.[0-9].[0-9]) \[DriverODBCVer\] => [0-9]{1,2}\.[0-9]{1,2} \[DriverVer\] => [0-9]{1,2}\.[0-9]{1,2}\.[0-9]{4} - \[ExtensionVer\] => [0-9].[0-9]\.[0-9](-(RC[0-9]|preview))?(\.[0-9]+)?(\+[0-9]+)? + \[ExtensionVer\] => [0-9].[0-9]\.[0-9](-(RC[0-9]?|preview))?(\.[0-9]+)?(\+[0-9]+)? \) \ No newline at end of file diff --git a/test/pdo_sqlsrv/pdo_get_set_attr.phpt b/test/pdo_sqlsrv/pdo_get_set_attr.phpt index 087c563e..4aac8bd4 100644 --- a/test/pdo_sqlsrv/pdo_get_set_attr.phpt +++ b/test/pdo_sqlsrv/pdo_get_set_attr.phpt @@ -145,7 +145,7 @@ array\(4\) { \["DriverVer"\]=> string\(10\) "[0-9]{2}.[0-9]{2}.[0-9]{4}" \["ExtensionVer"\]=> - string\([0-9]*\) \"[0-9].[0-9]\.[0-9](-(RC[0-9]|preview))?(\.[0-9]+)?(\+[0-9]+)?\" + string\([0-9]*\) \"[0-9].[0-9]\.[0-9](-(RC[0-9]?|preview))?(\.[0-9]+)?(\+[0-9]+)?\" } Test_6: diff --git a/test/sqlsrv/sqlsrv_client_info.phpt b/test/sqlsrv/sqlsrv_client_info.phpt index 4d1ed97b..1b8f7b31 100644 --- a/test/sqlsrv/sqlsrv_client_info.phpt +++ b/test/sqlsrv/sqlsrv_client_info.phpt @@ -21,5 +21,5 @@ array\(4\) { \[\"DriverVer\"\]=> string\(10\) \"[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{4}\" \[\"ExtensionVer\"\]=> - string\([0-9]+\) \"[0-9].[0-9]\.[0-9](-(RC[0-9]|preview))?(\.[0-9]+)?(\+[0-9]+)?\" + string\([0-9]+\) \"[0-9].[0-9]\.[0-9](-(RC[0-9]?|preview))?(\.[0-9]+)?(\+[0-9]+)?\" } \ No newline at end of file