diff options
author | Anatol Belski <ab@php.net> | 2018-01-02 12:29:19 +0100 |
---|---|---|
committer | Anatol Belski <ab@php.net> | 2018-01-02 12:29:19 +0100 |
commit | 8a8bf1dc133577f3c6730b3d34bf1e8970570115 (patch) | |
tree | 66f8c54e50b0d7d22273f025f4476d4bec32fb2f | |
parent | 08d06f7d4f1834a505f329ef3464c44431462ff8 (diff) | |
parent | 463fd04758f36a7051aafdee7d855d1c76f3fc3a (diff) | |
download | php-git-8a8bf1dc133577f3c6730b3d34bf1e8970570115.tar.gz |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Skip test for pdo_odbc
-rw-r--r-- | ext/pdo/tests/bug_43130.phpt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/pdo/tests/bug_43130.phpt b/ext/pdo/tests/bug_43130.phpt index 70f8887111..15c77b4180 100644 --- a/ext/pdo/tests/bug_43130.phpt +++ b/ext/pdo/tests/bug_43130.phpt @@ -9,6 +9,7 @@ if (!strncasecmp(getenv('PDOTEST_DSN'), 'sqlite', strlen('sqlite'))) die('skip n if (!strncasecmp(getenv('PDOTEST_DSN'), 'pgsql', strlen('pgsql'))) die('skip not relevant for pgsql driver'); if (!strncasecmp(getenv('PDOTEST_DSN'), 'oci', strlen('oci'))) die('skip not relevant for oci driver - Hyphen is not legal for bind names in Oracle DB'); if (!strncasecmp(getenv('PDOTEST_DSN'), 'firebird', strlen('firebird'))) die('skip not relevant for firebird driver'); +if (!strncasecmp(getenv('PDOTEST_DSN'), 'odbc', strlen('odbc'))) die('skip not relevant for odbc driver'); require_once $dir . 'pdo_test.inc'; PDOTest::skip(); ?> |