bjori Wed, 07 Sep 2011 10:34:58 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=316323
Log: Update skipif message Changed paths: U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_CURLOPT_READDATA.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_basic_011.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_copy_handle_basic_001.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_copy_handle_basic_002.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_copy_handle_basic_004.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_copy_handle_basic_005.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_copy_handle_basic_006.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_copy_handle_basic_007.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic002.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic003.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic004.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_version_error.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_version_variation1.phpt U php/php-src/branches/PHP_5_3/ext/curl/tests/curl_writeheader_callback.phpt U php/php-src/branches/PHP_5_4/ext/curl/tests/curl_CURLOPT_READDATA.phpt U php/php-src/branches/PHP_5_4/ext/curl/tests/curl_basic_011.phpt U php/php-src/branches/PHP_5_4/ext/curl/tests/curl_copy_handle_basic_001.phpt U php/php-src/branches/PHP_5_4/ext/curl/tests/curl_copy_handle_basic_004.phpt U php/php-src/branches/PHP_5_4/ext/curl/tests/curl_copy_handle_basic_005.phpt U php/php-src/branches/PHP_5_4/ext/curl/tests/curl_copy_handle_basic_006.phpt U php/php-src/branches/PHP_5_4/ext/curl/tests/curl_copy_handle_basic_007.phpt U php/php-src/branches/PHP_5_4/ext/curl/tests/curl_multi_getcontent_basic3.phpt U php/php-src/branches/PHP_5_4/ext/curl/tests/curl_setopt_basic002.phpt U php/php-src/branches/PHP_5_4/ext/curl/tests/curl_setopt_basic003.phpt U php/php-src/branches/PHP_5_4/ext/curl/tests/curl_setopt_basic004.phpt U php/php-src/branches/PHP_5_4/ext/curl/tests/curl_version_error.phpt U php/php-src/branches/PHP_5_4/ext/curl/tests/curl_version_variation1.phpt U php/php-src/branches/PHP_5_4/ext/curl/tests/curl_writeheader_callback.phpt U php/php-src/trunk/ext/curl/tests/curl_CURLOPT_READDATA.phpt U php/php-src/trunk/ext/curl/tests/curl_basic_011.phpt U php/php-src/trunk/ext/curl/tests/curl_copy_handle_basic_001.phpt U php/php-src/trunk/ext/curl/tests/curl_copy_handle_basic_002.phpt U php/php-src/trunk/ext/curl/tests/curl_copy_handle_basic_004.phpt U php/php-src/trunk/ext/curl/tests/curl_copy_handle_basic_005.phpt U php/php-src/trunk/ext/curl/tests/curl_copy_handle_basic_006.phpt U php/php-src/trunk/ext/curl/tests/curl_copy_handle_basic_007.phpt U php/php-src/trunk/ext/curl/tests/curl_setopt_basic002.phpt U php/php-src/trunk/ext/curl/tests/curl_setopt_basic003.phpt U php/php-src/trunk/ext/curl/tests/curl_setopt_basic004.phpt U php/php-src/trunk/ext/curl/tests/curl_version_error.phpt U php/php-src/trunk/ext/curl/tests/curl_version_variation1.phpt U php/php-src/trunk/ext/curl/tests/curl_writeheader_callback.phpt
Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/curl_CURLOPT_READDATA.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_CURLOPT_READDATA.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_CURLOPT_READDATA.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -4,7 +4,7 @@ Mattijs Hoitink mattijshoit...@gmail.com #Testfest Utrecht 2009 --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; ?> --FILE-- <?php Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/curl_basic_011.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_basic_011.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_basic_011.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -3,7 +3,7 @@ --CREDITS-- TestFest 2009 - AFUP - Xavier Gorse <xgo...@elao.com> --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv(b'PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php if (!extension_loaded("curl") || false === getenv(b'PHP_CURL_HTTP_REMOTE_SERVER')) print "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; ?> --FILE-- <?php /* Prototype : bool curl_setopt(resource ch, int option, mixed value) @@ -35,4 +35,4 @@ *** Testing curl with cookie *** string(3) "bar" ===DONE=== - \ No newline at end of file + Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/curl_copy_handle_basic_001.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_copy_handle_basic_001.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_copy_handle_basic_001.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -4,7 +4,7 @@ Rick Buitenman <r...@meritos.nl> #testfest Utrecht 2009 --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; ?> --FILE-- <?php @@ -39,4 +39,4 @@ array(0) { } " -===DONE=== \ No newline at end of file +===DONE=== Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/curl_copy_handle_basic_002.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_copy_handle_basic_002.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_copy_handle_basic_002.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -4,7 +4,7 @@ Rick Buitenman <r...@meritos.nl> #testfest Utrecht 2009 --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; ?> --FILE-- <?php $host = getenv('PHP_CURL_HTTP_REMOTE_SERVER'); Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/curl_copy_handle_basic_004.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_copy_handle_basic_004.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_copy_handle_basic_004.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -4,7 +4,7 @@ Rick Buitenman <r...@meritos.nl> #testfest Utrecht 2009 --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; ?> --FILE-- <?php @@ -41,4 +41,4 @@ array(0) { } " -===DONE=== \ No newline at end of file +===DONE=== Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/curl_copy_handle_basic_005.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_copy_handle_basic_005.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_copy_handle_basic_005.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -4,7 +4,7 @@ Rick Buitenman <r...@meritos.nl> #testfest Utrecht 2009 --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; ?> --FILE-- <?php Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/curl_copy_handle_basic_006.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_copy_handle_basic_006.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_copy_handle_basic_006.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -4,7 +4,7 @@ Rick Buitenman <r...@meritos.nl> #testfest Utrecht 2009 --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; ?> --FILE-- <?php Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/curl_copy_handle_basic_007.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_copy_handle_basic_007.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_copy_handle_basic_007.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -1,7 +1,7 @@ --TEST-- Test curl_copy_handle() with simple POST --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; ?> --FILE-- <?php $host = getenv('PHP_CURL_HTTP_REMOTE_SERVER'); Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic002.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic002.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic002.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -4,7 +4,7 @@ Paul Sohier #phptestfest utrecht --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; ?> --FILE-- <?php Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic003.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic003.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic003.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -4,7 +4,7 @@ Paul Sohier #phptestfest utrecht --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; ?> --FILE-- <?php Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic004.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic004.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_setopt_basic004.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -4,7 +4,7 @@ Paul Sohier #phptestfest utrecht --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; ?> --FILE-- <?php Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/curl_version_error.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_version_error.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_version_error.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -2,9 +2,12 @@ Test curl_version() function : error conditions --SKIPIF-- <?php -if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) { +if (!extension_loaded("curl")) { die('skip - curl extension not available in this build'); } +if (!getenv('PHP_CURL_HTTP_REMOTE_SERVER')) { + echo "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; +} ?> --FILE-- <?php Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/curl_version_variation1.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_version_variation1.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_version_variation1.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -2,9 +2,12 @@ Test curl_version() function : usage variations - test values for $ascii argument --SKIPIF-- <?php -if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) { - die('skip - curl extension not available in this build'); +if (!extension_loaded("curl")) { + echo "skip - curl extension not available in this build"; } +if (!getenv('PHP_CURL_HTTP_REMOTE_SERVER')) { + echo "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; +} ?> --FILE-- <?php Modified: php/php-src/branches/PHP_5_3/ext/curl/tests/curl_writeheader_callback.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/curl/tests/curl_writeheader_callback.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/branches/PHP_5_3/ext/curl/tests/curl_writeheader_callback.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -6,7 +6,14 @@ --DESCRIPTION-- Hit the host identified by PHP_CURL_HTTP_REMOTE_SERVER and determine that the headers are sent to the callback specified for CURLOPT_HEADERFUNCTION. Different test servers specified for PHP_CURL_HTTP_REMOTE_SERVER might return different sets of headers. Just test for HTTP/1.1 200 OK. --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php +if (!extension_loaded("curl")) { + echo "skip - curl extension not available in this build"; +} +if (!getenv('PHP_CURL_HTTP_REMOTE_SERVER')) { + echo "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; +} +?> --FILE-- <?php Modified: php/php-src/branches/PHP_5_4/ext/curl/tests/curl_CURLOPT_READDATA.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/curl/tests/curl_CURLOPT_READDATA.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/branches/PHP_5_4/ext/curl/tests/curl_CURLOPT_READDATA.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -4,7 +4,7 @@ Mattijs Hoitink mattijshoit...@gmail.com #Testfest Utrecht 2009 --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; ?> --FILE-- <?php Modified: php/php-src/branches/PHP_5_4/ext/curl/tests/curl_basic_011.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/curl/tests/curl_basic_011.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/branches/PHP_5_4/ext/curl/tests/curl_basic_011.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -3,7 +3,7 @@ --CREDITS-- TestFest 2009 - AFUP - Xavier Gorse <xgo...@elao.com> --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv(b'PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php if (!extension_loaded("curl") || false === getenv(b'PHP_CURL_HTTP_REMOTE_SERVER')) print "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; ?> --FILE-- <?php /* Prototype : bool curl_setopt(resource ch, int option, mixed value) @@ -35,4 +35,4 @@ *** Testing curl with cookie *** string(3) "bar" ===DONE=== - \ No newline at end of file + Modified: php/php-src/branches/PHP_5_4/ext/curl/tests/curl_copy_handle_basic_001.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/curl/tests/curl_copy_handle_basic_001.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/branches/PHP_5_4/ext/curl/tests/curl_copy_handle_basic_001.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -4,7 +4,7 @@ Rick Buitenman <r...@meritos.nl> #testfest Utrecht 2009 --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; ?> --FILE-- <?php @@ -39,4 +39,4 @@ array(0) { } " -===DONE=== \ No newline at end of file +===DONE=== Modified: php/php-src/branches/PHP_5_4/ext/curl/tests/curl_copy_handle_basic_004.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/curl/tests/curl_copy_handle_basic_004.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/branches/PHP_5_4/ext/curl/tests/curl_copy_handle_basic_004.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -4,7 +4,7 @@ Rick Buitenman <r...@meritos.nl> #testfest Utrecht 2009 --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; ?> --FILE-- <?php @@ -41,4 +41,4 @@ array(0) { } " -===DONE=== \ No newline at end of file +===DONE=== Modified: php/php-src/branches/PHP_5_4/ext/curl/tests/curl_copy_handle_basic_005.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/curl/tests/curl_copy_handle_basic_005.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/branches/PHP_5_4/ext/curl/tests/curl_copy_handle_basic_005.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -4,7 +4,7 @@ Rick Buitenman <r...@meritos.nl> #testfest Utrecht 2009 --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; ?> --FILE-- <?php Modified: php/php-src/branches/PHP_5_4/ext/curl/tests/curl_copy_handle_basic_006.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/curl/tests/curl_copy_handle_basic_006.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/branches/PHP_5_4/ext/curl/tests/curl_copy_handle_basic_006.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -4,7 +4,7 @@ Rick Buitenman <r...@meritos.nl> #testfest Utrecht 2009 --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; ?> --FILE-- <?php Modified: php/php-src/branches/PHP_5_4/ext/curl/tests/curl_copy_handle_basic_007.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/curl/tests/curl_copy_handle_basic_007.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/branches/PHP_5_4/ext/curl/tests/curl_copy_handle_basic_007.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -1,7 +1,7 @@ --TEST-- Test curl_copy_handle() with simple POST --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; ?> --FILE-- <?php $host = getenv('PHP_CURL_HTTP_REMOTE_SERVER'); Modified: php/php-src/branches/PHP_5_4/ext/curl/tests/curl_multi_getcontent_basic3.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/curl/tests/curl_multi_getcontent_basic3.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/branches/PHP_5_4/ext/curl/tests/curl_multi_getcontent_basic3.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -5,7 +5,7 @@ #TestFest Utrecht 20090509 --SKIPIF-- <?php -if (!extension_loaded('curl')) print 'skip'; +if (!extension_loaded('curl')) print 'skip need ext/curl'; ?> --FILE-- <?php @@ -51,6 +51,7 @@ Disallow: /backend/ Disallow: /distributions/ Disallow: /stats/ +Disallow: /server-status/ Disallow: /source.php Disallow: /search.php Disallow: /mod.php Modified: php/php-src/branches/PHP_5_4/ext/curl/tests/curl_setopt_basic002.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/curl/tests/curl_setopt_basic002.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/branches/PHP_5_4/ext/curl/tests/curl_setopt_basic002.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -4,7 +4,7 @@ Paul Sohier #phptestfest utrecht --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; ?> --FILE-- <?php Modified: php/php-src/branches/PHP_5_4/ext/curl/tests/curl_setopt_basic003.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/curl/tests/curl_setopt_basic003.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/branches/PHP_5_4/ext/curl/tests/curl_setopt_basic003.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -4,7 +4,7 @@ Paul Sohier #phptestfest utrecht --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; ?> --FILE-- <?php Modified: php/php-src/branches/PHP_5_4/ext/curl/tests/curl_setopt_basic004.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/curl/tests/curl_setopt_basic004.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/branches/PHP_5_4/ext/curl/tests/curl_setopt_basic004.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -4,7 +4,7 @@ Paul Sohier #phptestfest utrecht --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; ?> --FILE-- <?php Modified: php/php-src/branches/PHP_5_4/ext/curl/tests/curl_version_error.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/curl/tests/curl_version_error.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/branches/PHP_5_4/ext/curl/tests/curl_version_error.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -2,9 +2,12 @@ Test curl_version() function : error conditions --SKIPIF-- <?php -if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) { +if (!extension_loaded("curl")) { die('skip - curl extension not available in this build'); } +if (!getenv('PHP_CURL_HTTP_REMOTE_SERVER')) { + echo "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; +} ?> --FILE-- <?php Modified: php/php-src/branches/PHP_5_4/ext/curl/tests/curl_version_variation1.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/curl/tests/curl_version_variation1.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/branches/PHP_5_4/ext/curl/tests/curl_version_variation1.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -2,9 +2,12 @@ Test curl_version() function : usage variations - test values for $ascii argument --SKIPIF-- <?php -if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) { - die('skip - curl extension not available in this build'); +if (!extension_loaded("curl")) { + echo "skip - curl extension not available in this build"; } +if (!getenv('PHP_CURL_HTTP_REMOTE_SERVER')) { + echo "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; +} ?> --FILE-- <?php Modified: php/php-src/branches/PHP_5_4/ext/curl/tests/curl_writeheader_callback.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/curl/tests/curl_writeheader_callback.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/branches/PHP_5_4/ext/curl/tests/curl_writeheader_callback.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -6,7 +6,14 @@ --DESCRIPTION-- Hit the host identified by PHP_CURL_HTTP_REMOTE_SERVER and determine that the headers are sent to the callback specified for CURLOPT_HEADERFUNCTION. Different test servers specified for PHP_CURL_HTTP_REMOTE_SERVER might return different sets of headers. Just test for HTTP/1.1 200 OK. --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php +if (!extension_loaded("curl")) { + echo "skip - curl extension not available in this build"; +} +if (!getenv('PHP_CURL_HTTP_REMOTE_SERVER')) { + echo "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; +} +?> --FILE-- <?php Modified: php/php-src/trunk/ext/curl/tests/curl_CURLOPT_READDATA.phpt =================================================================== --- php/php-src/trunk/ext/curl/tests/curl_CURLOPT_READDATA.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/trunk/ext/curl/tests/curl_CURLOPT_READDATA.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -4,7 +4,7 @@ Mattijs Hoitink mattijshoit...@gmail.com #Testfest Utrecht 2009 --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; ?> --FILE-- <?php Modified: php/php-src/trunk/ext/curl/tests/curl_basic_011.phpt =================================================================== --- php/php-src/trunk/ext/curl/tests/curl_basic_011.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/trunk/ext/curl/tests/curl_basic_011.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -3,7 +3,7 @@ --CREDITS-- TestFest 2009 - AFUP - Xavier Gorse <xgo...@elao.com> --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php if (!extension_loaded("curl") || false === getenv(b'PHP_CURL_HTTP_REMOTE_SERVER')) print "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; ?> --FILE-- <?php /* Prototype : bool curl_setopt(resource ch, int option, mixed value) @@ -35,3 +35,4 @@ *** Testing curl with cookie *** string(3) "bar" ===DONE=== + Modified: php/php-src/trunk/ext/curl/tests/curl_copy_handle_basic_001.phpt =================================================================== --- php/php-src/trunk/ext/curl/tests/curl_copy_handle_basic_001.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/trunk/ext/curl/tests/curl_copy_handle_basic_001.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -4,7 +4,7 @@ Rick Buitenman <r...@meritos.nl> #testfest Utrecht 2009 --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; ?> --FILE-- <?php @@ -39,4 +39,4 @@ array(0) { } " -===DONE=== \ No newline at end of file +===DONE=== Modified: php/php-src/trunk/ext/curl/tests/curl_copy_handle_basic_002.phpt =================================================================== --- php/php-src/trunk/ext/curl/tests/curl_copy_handle_basic_002.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/trunk/ext/curl/tests/curl_copy_handle_basic_002.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -4,7 +4,7 @@ Rick Buitenman <r...@meritos.nl> #testfest Utrecht 2009 --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; ?> --FILE-- <?php $host = getenv('PHP_CURL_HTTP_REMOTE_SERVER'); Modified: php/php-src/trunk/ext/curl/tests/curl_copy_handle_basic_004.phpt =================================================================== --- php/php-src/trunk/ext/curl/tests/curl_copy_handle_basic_004.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/trunk/ext/curl/tests/curl_copy_handle_basic_004.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -4,7 +4,7 @@ Rick Buitenman <r...@meritos.nl> #testfest Utrecht 2009 --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; ?> --FILE-- <?php @@ -41,4 +41,4 @@ array(0) { } " -===DONE=== \ No newline at end of file +===DONE=== Modified: php/php-src/trunk/ext/curl/tests/curl_copy_handle_basic_005.phpt =================================================================== --- php/php-src/trunk/ext/curl/tests/curl_copy_handle_basic_005.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/trunk/ext/curl/tests/curl_copy_handle_basic_005.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -4,7 +4,7 @@ Rick Buitenman <r...@meritos.nl> #testfest Utrecht 2009 --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; ?> --FILE-- <?php Modified: php/php-src/trunk/ext/curl/tests/curl_copy_handle_basic_006.phpt =================================================================== --- php/php-src/trunk/ext/curl/tests/curl_copy_handle_basic_006.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/trunk/ext/curl/tests/curl_copy_handle_basic_006.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -4,7 +4,7 @@ Rick Buitenman <r...@meritos.nl> #testfest Utrecht 2009 --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; ?> --FILE-- <?php Modified: php/php-src/trunk/ext/curl/tests/curl_copy_handle_basic_007.phpt =================================================================== --- php/php-src/trunk/ext/curl/tests/curl_copy_handle_basic_007.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/trunk/ext/curl/tests/curl_copy_handle_basic_007.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -1,7 +1,7 @@ --TEST-- Test curl_copy_handle() with simple POST --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; ?> --FILE-- <?php $host = getenv('PHP_CURL_HTTP_REMOTE_SERVER'); Modified: php/php-src/trunk/ext/curl/tests/curl_setopt_basic002.phpt =================================================================== --- php/php-src/trunk/ext/curl/tests/curl_setopt_basic002.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/trunk/ext/curl/tests/curl_setopt_basic002.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -4,7 +4,7 @@ Paul Sohier #phptestfest utrecht --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; ?> --FILE-- <?php Modified: php/php-src/trunk/ext/curl/tests/curl_setopt_basic003.phpt =================================================================== --- php/php-src/trunk/ext/curl/tests/curl_setopt_basic003.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/trunk/ext/curl/tests/curl_setopt_basic003.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -4,7 +4,7 @@ Paul Sohier #phptestfest utrecht --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; ?> --FILE-- <?php Modified: php/php-src/trunk/ext/curl/tests/curl_setopt_basic004.phpt =================================================================== --- php/php-src/trunk/ext/curl/tests/curl_setopt_basic004.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/trunk/ext/curl/tests/curl_setopt_basic004.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -4,7 +4,7 @@ Paul Sohier #phptestfest utrecht --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; ?> --FILE-- <?php Modified: php/php-src/trunk/ext/curl/tests/curl_version_error.phpt =================================================================== --- php/php-src/trunk/ext/curl/tests/curl_version_error.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/trunk/ext/curl/tests/curl_version_error.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -2,9 +2,12 @@ Test curl_version() function : error conditions --SKIPIF-- <?php -if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) { +if (!extension_loaded("curl")) { die('skip - curl extension not available in this build'); } +if (!getenv('PHP_CURL_HTTP_REMOTE_SERVER')) { + echo "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; +} ?> --FILE-- <?php Modified: php/php-src/trunk/ext/curl/tests/curl_version_variation1.phpt =================================================================== --- php/php-src/trunk/ext/curl/tests/curl_version_variation1.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/trunk/ext/curl/tests/curl_version_variation1.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -2,9 +2,12 @@ Test curl_version() function : usage variations - test values for $ascii argument --SKIPIF-- <?php -if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) { - die('skip - curl extension not available in this build'); +if (!extension_loaded("curl")) { + echo "skip - curl extension not available in this build"; } +if (!getenv('PHP_CURL_HTTP_REMOTE_SERVER')) { + echo "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; +} ?> --FILE-- <?php Modified: php/php-src/trunk/ext/curl/tests/curl_writeheader_callback.phpt =================================================================== --- php/php-src/trunk/ext/curl/tests/curl_writeheader_callback.phpt 2011-09-07 10:32:54 UTC (rev 316322) +++ php/php-src/trunk/ext/curl/tests/curl_writeheader_callback.phpt 2011-09-07 10:34:58 UTC (rev 316323) @@ -6,7 +6,14 @@ --DESCRIPTION-- Hit the host identified by PHP_CURL_HTTP_REMOTE_SERVER and determine that the headers are sent to the callback specified for CURLOPT_HEADERFUNCTION. Different test servers specified for PHP_CURL_HTTP_REMOTE_SERVER might return different sets of headers. Just test for HTTP/1.1 200 OK. --SKIPIF-- -<?php if (!extension_loaded("curl") || false === getenv('PHP_CURL_HTTP_REMOTE_SERVER')) print "skip"; ?> +<?php +if (!extension_loaded("curl")) { + echo "skip - curl extension not available in this build"; +} +if (!getenv('PHP_CURL_HTTP_REMOTE_SERVER')) { + echo "skip need PHP_CURL_HTTP_REMOTE_SERVER environment variable"; +} +?> --FILE-- <?php
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php