Merge pull request #821 from david-puglielli/skipif-fix

Skipif fix
microsoft · Jul 27, 2018 · c533ffa · c533ffa
2 parents b6d815b + 7357a16
commit c533ffa
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/test/functional/pdo_sqlsrv/skipif_version_less_than_2k14.inc b/test/functional/pdo_sqlsrv/skipif_version_less_than_2k14.inc
@@ -21,8 +21,12 @@ $msodbcsql_maj = explode(".", $msodbcsql_ver)[0];
 $msodbcsql_min = explode(".", $msodbcsql_ver)[1];
 
 if (!$is_win) {
-    if ($msodbcsql_maj < 17 or $msodbcsql_min < 2) {
+    if ($msodbcsql_maj < 17) {
         die("skip Unsupported ODBC driver version");
+    } else {
+        if ($msodbcsql_maj==17 && $msodbcsql_min < 2) {
+            die("skip Unsupported ODBC driver version");
+        }
     }
 }
 

diff --git a/test/functional/sqlsrv/skipif_version_less_than_2k14.inc b/test/functional/sqlsrv/skipif_version_less_than_2k14.inc
@@ -23,8 +23,12 @@ $msodbcsql_maj = explode(".", $msodbcsql_ver)[0];
 $msodbcsql_min = explode(".", $msodbcsql_ver)[1];
 
 if (!$is_win) {
-    if ($msodbcsql_maj < 17 or $msodbcsql_min < 2) {
+    if ($msodbcsql_maj < 17) {
         die("skip Unsupported ODBC driver version");
+    } else {
+        if ($msodbcsql_maj==17 && $msodbcsql_min < 2) {
+            die("skip Unsupported ODBC driver version");
+        }
     }
 }