felipe Thu, 01 Dec 2011 15:47:58 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=320252
Log: - Replace possible esc char to <esc> in the XML output Changed paths: U php/php-src/branches/PHP_5_3/run-tests.php U php/php-src/branches/PHP_5_4/run-tests.php U php/php-src/trunk/run-tests.php Modified: php/php-src/branches/PHP_5_3/run-tests.php =================================================================== --- php/php-src/branches/PHP_5_3/run-tests.php 2011-12-01 15:38:17 UTC (rev 320251) +++ php/php-src/branches/PHP_5_3/run-tests.php 2011-12-01 15:47:58 UTC (rev 320252) @@ -2100,11 +2100,11 @@ } elseif (in_array('FAIL', $restype)) { $JUNIT['test_fail']++; - $JUNIT['result_xml'] .= '<failure type="'.$restype[0].'ED" message="'.$info.'"><![CDATA['."\n".$diff."\n".']]></failure>'."\n"; + $JUNIT['result_xml'] .= '<failure type="'.$restype[0].'ED" message="'.$info.'"><![CDATA['."\n".preg_replace('/\e/', '<esc>', $diff)."\n".']]></failure>'."\n"; } else{ $JUNIT['test_error']++; - $JUNIT['result_xml'] .= '<error type="'.$restype[0].'ED" message="'.$info.'"><![CDATA['."\n".$diff."\n".']]></error>'."\n"; + $JUNIT['result_xml'] .= '<error type="'.$restype[0].'ED" message="'.$info.'"><![CDATA['."\n".preg_replace('/\e/', '<esc>', $diff)."\n".']]></error>'."\n"; } $JUNIT['result_xml'] .= '</testcase>'."\n"; } Modified: php/php-src/branches/PHP_5_4/run-tests.php =================================================================== --- php/php-src/branches/PHP_5_4/run-tests.php 2011-12-01 15:38:17 UTC (rev 320251) +++ php/php-src/branches/PHP_5_4/run-tests.php 2011-12-01 15:47:58 UTC (rev 320252) @@ -2100,11 +2100,11 @@ } elseif (in_array('FAIL', $restype)) { $JUNIT['test_fail']++; - $JUNIT['result_xml'] .= '<failure type="'.$restype[0].'ED" message="'.$info.'"><![CDATA['."\n".$diff."\n".']]></failure>'."\n"; + $JUNIT['result_xml'] .= '<failure type="'.$restype[0].'ED" message="'.$info.'"><![CDATA['."\n".preg_replace('/\e/', '<esc>', $diff)."\n".']]></failure>'."\n"; } else{ $JUNIT['test_error']++; - $JUNIT['result_xml'] .= '<error type="'.$restype[0].'ED" message="'.$info.'"><![CDATA['."\n".$diff."\n".']]></error>'."\n"; + $JUNIT['result_xml'] .= '<error type="'.$restype[0].'ED" message="'.$info.'"><![CDATA['."\n".preg_replace('/\e/', '<esc>', $diff)."\n".']]></error>'."\n"; } $JUNIT['result_xml'] .= '</testcase>'."\n"; } Modified: php/php-src/trunk/run-tests.php =================================================================== --- php/php-src/trunk/run-tests.php 2011-12-01 15:38:17 UTC (rev 320251) +++ php/php-src/trunk/run-tests.php 2011-12-01 15:47:58 UTC (rev 320252) @@ -2100,11 +2100,11 @@ } elseif (in_array('FAIL', $restype)) { $JUNIT['test_fail']++; - $JUNIT['result_xml'] .= '<failure type="'.$restype[0].'ED" message="'.$info.'"><![CDATA['."\n".$diff."\n".']]></failure>'."\n"; + $JUNIT['result_xml'] .= '<failure type="'.$restype[0].'ED" message="'.$info.'"><![CDATA['."\n".preg_replace('/\e/', '<esc>', $diff)."\n".']]></failure>'."\n"; } else{ $JUNIT['test_error']++; - $JUNIT['result_xml'] .= '<error type="'.$restype[0].'ED" message="'.$info.'"><![CDATA['."\n".$diff."\n".']]></error>'."\n"; + $JUNIT['result_xml'] .= '<error type="'.$restype[0].'ED" message="'.$info.'"><![CDATA['."\n".preg_replace('/\e/', '<esc>', $diff)."\n".']]></error>'."\n"; } $JUNIT['result_xml'] .= '</testcase>'."\n"; }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php