Merge branch 'PHP-7.0'

* PHP-7.0:
  fix test
  add skip slow test
This commit is contained in:
Anatol Belski 2016-04-06 08:24:09 +02:00
commit fe757f09a4
2 changed files with 4 additions and 3 deletions

View file

@ -14,7 +14,7 @@ $stmt->execute();
var_dump($stmt->getColumnMeta(0));
$stmt = null;
?>
--EXPECT--
--EXPECTF--
array(10) {
["max_length"]=>
int(255)
@ -27,9 +27,9 @@ array(10) {
["native_type"]=>
string(4) "char"
["native_type_id"]=>
int(47)
int(%d)
["native_usertype_id"]=>
int(2)
int(%d)
["name"]=>
string(13) "TABLE_CATALOG"
["len"]=>

View file

@ -3,6 +3,7 @@ PDO_DBLIB: Set query timeouts
--SKIPIF--
<?php
if (!extension_loaded('pdo_dblib')) die('skip not loaded');
if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
require dirname(__FILE__) . '/config.inc';
?>
--FILE--