diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-08-10 23:12:51 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-08-10 23:12:51 -0700 |
| commit | 29f1aa2618e7cd92c5d843e2334f2d1f6bb33225 (patch) | |
| tree | fa63317e2d171b9dafd254d3e06c45037292e168 | |
| parent | 1a5c460ea2f74c46f87e5a92631506a35eeb6aa0 (diff) | |
| parent | cf39c3d63829235626fd4dcb52e1274ca561932e (diff) | |
| download | php-git-29f1aa2618e7cd92c5d843e2334f2d1f6bb33225.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
ensure notices are not ignored when tests need them
| -rw-r--r-- | ext/pgsql/tests/09notice.phpt | 2 | ||||
| -rw-r--r-- | ext/pgsql/tests/80_bug32223.phpt | 2 | ||||
| -rw-r--r-- | ext/pgsql/tests/80_bug32223b.phpt | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/ext/pgsql/tests/09notice.phpt b/ext/pgsql/tests/09notice.phpt index 3167069169..67ef262fca 100644 --- a/ext/pgsql/tests/09notice.phpt +++ b/ext/pgsql/tests/09notice.phpt @@ -10,7 +10,7 @@ _skip_lc_messages(); ?> --INI-- pgsql.log_notice=1 -pgsql.ignore_notices=0 +pgsql.ignore_notice=0 --FILE-- <?php include 'config.inc'; diff --git a/ext/pgsql/tests/80_bug32223.phpt b/ext/pgsql/tests/80_bug32223.phpt index 573742c6e4..cad5fb3a12 100644 --- a/ext/pgsql/tests/80_bug32223.phpt +++ b/ext/pgsql/tests/80_bug32223.phpt @@ -15,6 +15,8 @@ end; ' LANGUAGE plpgsql;"); if (!$res) die('skip PLPGSQL not available'); ?> +--INI-- +pgsql.ignore_notice=0 --FILE-- <?php diff --git a/ext/pgsql/tests/80_bug32223b.phpt b/ext/pgsql/tests/80_bug32223b.phpt index aada3f01ba..e79685c43d 100644 --- a/ext/pgsql/tests/80_bug32223b.phpt +++ b/ext/pgsql/tests/80_bug32223b.phpt @@ -15,6 +15,8 @@ end; ' LANGUAGE plpgsql;"); if (!$res) die('skip PLPGSQL not available'); ?> +--INI-- +pgsql.ignore_notice=0 --FILE-- <?php |