diff options
| author | Anatol Belski <ab@php.net> | 2016-02-23 14:22:06 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-02-23 14:22:06 +0100 |
| commit | cd75429ad87cfd7a00d92a4599bff6eb77cdcec1 (patch) | |
| tree | 823def82160afeea7cde91e5bb0b11f5bd76cdac /ext/odbc | |
| parent | 18e3b11d62e26b6b93ab41227e3d73104ca05391 (diff) | |
| parent | 9623d2dd83a0bace42e14d965d2303349c7f235a (diff) | |
| download | php-git-cd75429ad87cfd7a00d92a4599bff6eb77cdcec1.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
make ext/odbc test credentials configurable
Diffstat (limited to 'ext/odbc')
| -rw-r--r-- | ext/odbc/tests/config.inc | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/ext/odbc/tests/config.inc b/ext/odbc/tests/config.inc index a88eea4ed0..dcc4cbb3bf 100644 --- a/ext/odbc/tests/config.inc +++ b/ext/odbc/tests/config.inc @@ -3,6 +3,17 @@ putenv('ODBCINI=/etc/odbc.ini'); putenv('ODBCSYSINI=/etc'); -$dsn = 'myodbc3'; -$user = 'root'; -$pass = ''; +$dsn = getenv("ODBC_TEST_DSN"); +$user = getenv("ODBC_TEST_USER"); +$pass = getenv("ODBC_TEST_PASS"); + +if (false === $dsn) { + $dsn = 'myodbc3'; +} +if (false === $user) { + $user = 'root'; +} +if (false == $pass) { + $pass = ''; +} + |