Fixed expected output of a few cURL test cases

diff --git a/ext/curl/tests/bug48203_multi.phpt b/ext/curl/tests/bug48203_multi.phpt
index 7d4ee4769e1dca90a8672b26b0e820ec91a10573..501b77843e2ef3837628efc81dce248235f07b94 100644 (file)
--- a/ext/curl/tests/bug48203_multi.phpt
+++ b/ext/curl/tests/bug48203_multi.phpt
@@ -81,8 +81,7 @@ Ok for CURLOPT_WRITEHEADER
 Warning: curl_multi_exec(): CURLOPT_FILE resource has gone away, resetting to default in %sbug48203_multi.php on line 36
 
 Warning: curl_multi_exec(): CURLOPT_FILE resource has gone away, resetting to default in %sbug48203_multi.php on line 36
-%A
-Ok for CURLOPT_FILE
+%AOk for CURLOPT_FILE
 
 Warning: curl_multi_exec(): CURLOPT_INFILE resource has gone away, resetting to default in %sbug48203_multi.php on line 36
 

diff --git a/ext/curl/tests/bug54798.phpt b/ext/curl/tests/bug54798.phpt
index 7ec84addae156312914c5fce9f6bad833ee3b35c..f633a8ab2a44f2d9f992ff73ea8bdd482b36494c 100644 (file)
--- a/ext/curl/tests/bug54798.phpt
+++ b/ext/curl/tests/bug54798.phpt
@@ -58,15 +58,14 @@ foreach($options_to_check as $option) {
 --EXPECTF--
 Warning: curl_exec(): CURLOPT_STDERR resource has gone away, resetting to stderr in %sbug54798.php on line %d
 * About to connect() %a
-* Closing connection #%d
+* Closing connection %d
 Ok for CURLOPT_STDERR
 
 Warning: curl_exec(): CURLOPT_WRITEHEADER resource has gone away, resetting to default in %sbug54798.php on line 24
 Ok for CURLOPT_WRITEHEADER
 
 Warning: curl_exec(): CURLOPT_FILE resource has gone away, resetting to default in %sbug54798.php on line 24
-%a
-Ok for CURLOPT_FILE
+%aOk for CURLOPT_FILE
 
 Warning: curl_exec(): CURLOPT_INFILE resource has gone away, resetting to default in %sbug54798.php on line %d
 Ok for CURLOPT_INFILE

diff --git a/ext/curl/tests/curl_file_deleted_before_curl_close.phpt b/ext/curl/tests/curl_file_deleted_before_curl_close.phpt
index 592f110fbe80b005b6ea256dd3edfe7678cefdd7..3a4d949e7599267c7085b82c043cff22fa965c91 100644 (file)
--- a/ext/curl/tests/curl_file_deleted_before_curl_close.phpt
+++ b/ext/curl/tests/curl_file_deleted_before_curl_close.phpt
@@ -33,6 +33,5 @@ echo "Closed correctly\n";
 <?php
 unlink(dirname(__FILE__) . '/curl_file_deleted_before_curl_close.tmp');
 ?>
---EXPECTF--
-* Closing connection #%d
+--EXPECT--
 Closed correctly

diff --git a/ext/curl/tests/curl_setopt_basic002.phpt b/ext/curl/tests/curl_setopt_basic002.phpt
index d90ecb7bd22f3367aeac194e793c5f58db2ee785..074158a4b39f1ff31ac471e6af28522dd3dace44 100644 (file)
--- a/ext/curl/tests/curl_setopt_basic002.phpt
+++ b/ext/curl/tests/curl_setopt_basic002.phpt
@@ -48,5 +48,4 @@ curl_close($ch);
 *** Testing curl_setopt with CURLOPT_STDERR
 string(%d) "%S"
 string(%d) "%S"
-* Closing connection #%d