diff options
| author | Anatol Belski <ab@php.net> | 2015-03-14 18:30:32 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-03-14 18:30:32 +0100 |
| commit | 2ac31872ac56cbeb3b8ef905c52b8f4dbf682311 (patch) | |
| tree | cb2366f526abbd5531a52769c5b257f94b261f6a | |
| parent | 846c8059e60b1c5ac918b2036c15b490971eb6e3 (diff) | |
| parent | c21c8f369d5640e5563e6b2423304ec4f533adfc (diff) | |
| download | php-git-2ac31872ac56cbeb3b8ef905c52b8f4dbf682311.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix test
| -rw-r--r-- | ext/pdo_pgsql/tests/bug66584.phpt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/pdo_pgsql/tests/bug66584.phpt b/ext/pdo_pgsql/tests/bug66584.phpt index 07742bca79..1a430f0c13 100644 --- a/ext/pdo_pgsql/tests/bug66584.phpt +++ b/ext/pdo_pgsql/tests/bug66584.phpt @@ -3,6 +3,7 @@ PDO PgSQL Bug #66584 (Segmentation fault on statement deallocation) --SKIPIF-- <?php if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not loaded'); +if (!extension_loaded('json')) die('skip json ext not loaded'); require dirname(__FILE__) . '/config.inc'; require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc'; PDOTest::skip(); |