wharmby Thu Jun 11 21:11:20 2009 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/curl/tests bug45161.phpt bug46739.phpt bug46711.phpt bug48203.phpt Log: Add/Fix SKIPIF sections of cURL tests http://cvs.php.net/viewvc.cgi/php-src/ext/curl/tests/bug45161.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u Index: php-src/ext/curl/tests/bug45161.phpt diff -u php-src/ext/curl/tests/bug45161.phpt:1.1.2.3 php-src/ext/curl/tests/bug45161.phpt:1.1.2.4 --- php-src/ext/curl/tests/bug45161.phpt:1.1.2.3 Thu Apr 30 10:41:54 2009 +++ php-src/ext/curl/tests/bug45161.phpt Thu Jun 11 21:11:20 2009 @@ -1,7 +1,21 @@ --TEST-- Bug #45161 (Reusing a curl handle leaks memory) --SKIPIF-- -<?php $curl_version = curl_version(); if ($curl_version['version_number'] < 0x071100) die("skip: test works only with curl >= 7.17.0"); ?> +<?php +if (substr(PHP_OS, 0, 3) == 'WIN') { + exit("skip not for Windows"); +} +if (!extension_loaded("curl")) { + exit("skip curl extension not loaded"); +} +if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) { + exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined"); +} +$curl_version = curl_version(); +if ($curl_version['version_number'] < 0x071100) { + exit("skip: test works only with curl >= 7.17.0"); +} +?> --FILE-- <?php http://cvs.php.net/viewvc.cgi/php-src/ext/curl/tests/bug46739.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u Index: php-src/ext/curl/tests/bug46739.phpt diff -u php-src/ext/curl/tests/bug46739.phpt:1.1.2.3 php-src/ext/curl/tests/bug46739.phpt:1.1.2.4 --- php-src/ext/curl/tests/bug46739.phpt:1.1.2.3 Wed Dec 17 14:00:20 2008 +++ php-src/ext/curl/tests/bug46739.phpt Thu Jun 11 21:11:20 2009 @@ -1,5 +1,14 @@ --TEST-- Bug #46739 (array returned by curl_getinfo should contain content_type key) +--SKIPIF-- +<?php +if (!extension_loaded("curl")) { + exit("skip curl extension not loaded"); +} +if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) { + exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined"); +} +?> --FILE-- <?php $ch = curl_init('http://127.0.0.1:9/'); http://cvs.php.net/viewvc.cgi/php-src/ext/curl/tests/bug46711.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/curl/tests/bug46711.phpt diff -u php-src/ext/curl/tests/bug46711.phpt:1.1.2.2 php-src/ext/curl/tests/bug46711.phpt:1.1.2.3 --- php-src/ext/curl/tests/bug46711.phpt:1.1.2.2 Thu Apr 30 10:41:54 2009 +++ php-src/ext/curl/tests/bug46711.phpt Thu Jun 11 21:11:20 2009 @@ -1,5 +1,14 @@ --TEST-- Bug #46711 (lost memory when foreach is used for values passed to curl_setopt()) +--SKIPIF-- +<?php +if (!extension_loaded("curl")) { + exit("skip curl extension not loaded"); +} +if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) { + exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined"); +} +?> --FILE-- <?php $ch = curl_init(); http://cvs.php.net/viewvc.cgi/php-src/ext/curl/tests/bug48203.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/ext/curl/tests/bug48203.phpt diff -u php-src/ext/curl/tests/bug48203.phpt:1.1.2.2 php-src/ext/curl/tests/bug48203.phpt:1.1.2.3 --- php-src/ext/curl/tests/bug48203.phpt:1.1.2.2 Tue May 26 17:19:23 2009 +++ php-src/ext/curl/tests/bug48203.phpt Thu Jun 11 21:11:20 2009 @@ -1,5 +1,14 @@ --TEST-- Bug #48203 (Crash when CURLOPT_STDERR is set to regular file) +--SKIPIF-- +<?php +if (!extension_loaded("curl")) { + exit("skip curl extension not loaded"); +} +if (false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) { + exit("skip PHP_CURL_HTTP_REMOTE_SERVER env variable is not defined"); +} +?> --FILE-- <?php
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php