[PHP-CVS] com php-src: - Fixed bug #62415 (Undefined variable: diff in run-tests.php on line 2093 for successful XFAIL): run-tests.php

2012-06-30 Thread Felipe Pena
Commit:75d8af715cd624dda243d31f826c7da927ccd22f
Author:Felipe Pena felipe...@gmail.com Sat, 30 Jun 2012 16:29:30 
-0300
Parents:   8fe87e7feaab2c031998d553585ba8cabf077499
Branches:  PHP-5.3 PHP-5.4

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=75d8af715cd624dda243d31f826c7da927ccd22f

Log:
- Fixed bug #62415 (Undefined variable: diff in run-tests.php on line 2093 for 
successful XFAIL)

Bugs:
https://bugs.php.net/62415

Changed paths:
  M  run-tests.php


Diff:
diff --git a/run-tests.php b/run-tests.php
index 9a01f56..2a46986 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -2089,8 +2089,10 @@ $output
if (isset($old_php)) {
$php = $old_php;
}
+   
+   $diff = empty($diff) ? '' : ![CDATA[\n  . preg_replace('/\e/', 
'esc', $diff) . \n]];
 
-   junit_mark_test_as($restype, str_replace($cwd . '/', '', $tested_file), 
$tested, null, $info, ![CDATA[\n  . preg_replace('/\e/', 'esc', $diff) . 
\n]]);
+   junit_mark_test_as($restype, str_replace($cwd . '/', '', $tested_file), 
$tested, null, $info, $diff);
 
return $restype[0] . 'ED';
 }


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php



[PHP-CVS] com php-src: - Fixed bug #62415 (Undefined variable: diff in run-tests.php on line 2093 for successful XFAIL): run-tests.php

2012-06-30 Thread Felipe Pena
Commit:eb012cf88440423ff02c46421f29a1c6e850702c
Author:Felipe Pena felipe...@gmail.com Sat, 30 Jun 2012 16:42:28 
-0300
Parents:   c51fbbe4b4e2c047d1be76d8bffc6391203adbdd 
b8d453d8d4b6a67531aa1c2d0d7bab1e25ed1d4f
Branches:  master

Link:   
http://git.php.net/?p=php-src.git;a=commitdiff;h=eb012cf88440423ff02c46421f29a1c6e850702c

Log:
- Fixed bug #62415 (Undefined variable: diff in run-tests.php on line 2093 for 
successful XFAIL)

Bugs:
https://bugs.php.net/62415

Changed paths:
  MM  run-tests.php


Diff:



--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php