diff options
| author | Christopher Jones <sixd@php.net> | 2013-08-14 15:45:46 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-08-14 15:45:46 -0700 |
| commit | 8c61758dc772345636e436e3f69bef7323f8b339 (patch) | |
| tree | 93eb470b73b402d972eba60e6aa32d735b73acc5 | |
| parent | 2b9f5ac2525118bab372d5fc66eb19cabc46f483 (diff) | |
| parent | 9d62807190ebda858acbb09ad832c96570a97c40 (diff) | |
| download | php-git-8c61758dc772345636e436e3f69bef7323f8b339.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Skip test if SKIP_ONLINE_TESTS set
| -rw-r--r-- | ext/standard/tests/file/file_get_contents_error001.phpt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/standard/tests/file/file_get_contents_error001.phpt b/ext/standard/tests/file/file_get_contents_error001.phpt index 127901ad79..a347d9d3d1 100644 --- a/ext/standard/tests/file/file_get_contents_error001.phpt +++ b/ext/standard/tests/file/file_get_contents_error001.phpt @@ -10,6 +10,7 @@ display_errors=false if (getenv("SKIP_SLOW_TESTS")) die("skip slow test"); if (!function_exists("file_get_contents")) die ("skip file_get_contents function is not found"); + if (getenv("SKIP_ONLINE_TESTS")) die("skip online test"); ?> --FILE-- <?php |