com php-src: - Fixed bug #62415 (Undefined variable: diff in run-tests.php on line 2093 for successful XFAIL): run-tests.php
| From: | Felipe Pena | Date: | Sat, 30 Jun 2012 19:29:30 +0000 |
| Subject: | com php-src: - Fixed bug #62415 (Undefined variable: diff in run-tests.php on line 2093 for successful XFAIL): run-tests.php | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-69496@lists.php.net to get a copy of this message | ||
Commit: 75d8af715cd624dda243d31f826c7da927ccd22f
Author: Felipe Pena <felipensp@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';
}