diff options
| author | Felipe Pena <felipensp@gmail.com> | 2012-06-30 16:29:47 -0300 |
|---|---|---|
| committer | Felipe Pena <felipensp@gmail.com> | 2012-06-30 16:29:47 -0300 |
| commit | b8d453d8d4b6a67531aa1c2d0d7bab1e25ed1d4f (patch) | |
| tree | 01599f33c15bfab4494225fada59bc453aeb54b8 | |
| parent | ed1f058591778103ea852324ad6cd847a10b2911 (diff) | |
| parent | 75d8af715cd624dda243d31f826c7da927ccd22f (diff) | |
| download | php-git-b8d453d8d4b6a67531aa1c2d0d7bab1e25ed1d4f.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
- Fixed bug #62415 (Undefined variable: diff in run-tests.php on line 2093 for successful XFAIL)
| -rwxr-xr-x | run-tests.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/run-tests.php b/run-tests.php index 9a01f56c97..2a4698639f 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'; } |