archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-21 01:45:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'PHP-7.0'

Browse source 
* 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
Download patch file Download diff file Expand all files Collapse all files

6
ext/pdo_dblib/tests/bug_45876.phpt
View file

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

1
ext/pdo_dblib/tests/timeout.phpt
View file

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