diff options
| author | Ben Fuhrmannek | 2014-10-14 10:09:51 +0200 |
|---|---|---|
| committer | Ben Fuhrmannek | 2014-10-14 10:09:51 +0200 |
| commit | 82e8d0eb03fb3bd88062e99065f990b26fb9fc8b (patch) | |
| tree | 1df0307a474e42e031b5a7aafcf7bfe762de4b4a /tests/sql/skipifmysqli.inc | |
| parent | c8724cde260e6c8bab4aefffffa1aa46f92a57ee (diff) | |
| parent | ff4edc6ecf463211c6527879d6b23f991fd5b73b (diff) | |
Merge branch 'buf2' (closes #52 and #54)
Conflicts:
tests/filter/suhosin_upload_disallow_binary_utf8.phpt
tests/filter/suhosin_upload_disallow_binary_utf8fail.phpt
tests/filter/suhosin_upload_remove_binary_utf8.phpt
tests/filter/suhosin_upload_remove_binary_utf8fail.phpt
Diffstat (limited to 'tests/sql/skipifmysqli.inc')
| -rw-r--r-- | tests/sql/skipifmysqli.inc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/sql/skipifmysqli.inc b/tests/sql/skipifmysqli.inc index ee16cf1..99c235d 100644 --- a/tests/sql/skipifmysqli.inc +++ b/tests/sql/skipifmysqli.inc | |||
| @@ -2,4 +2,7 @@ | |||
| 2 | if (!extension_loaded("mysqli")) { | 2 | if (!extension_loaded("mysqli")) { |
| 3 | die('skip - mysqli extension not available'); | 3 | die('skip - mysqli extension not available'); |
| 4 | } | 4 | } |
| 5 | if (!getenv("TEST_SUHOSIN_MYSQL")) { | ||
| 6 | die("skip TEST_SUHOSIN_MYSQL is not set"); | ||
| 7 | } | ||
| 5 | ?> \ No newline at end of file | 8 | ?> \ No newline at end of file |