summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Pena <felipensp@gmail.com>2012-06-30 16:29:30 -0300
committerFelipe Pena <felipensp@gmail.com>2012-06-30 16:29:30 -0300
commit75d8af715cd624dda243d31f826c7da927ccd22f (patch)
tree0fc5e56ebb2075242ab3ce3887d60320806ebada
parent8fe87e7feaab2c031998d553585ba8cabf077499 (diff)
downloadphp-git-75d8af715cd624dda243d31f826c7da927ccd22f.tar.gz
- Fixed bug #62415 (Undefined variable: diff in run-tests.php on line 2093 for successful XFAIL)
-rwxr-xr-xrun-tests.php4
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';
}