Merge branch 'PHP-5.3' into PHP-5.4

felipensp · felipensp · commit b8d453d8d4b6 · 2012-06-30T16:29:47.000-03:00
* PHP-5.3:
  - Fixed bug #62415 (Undefined variable: diff in run-tests.php on line 2093 for successful XFAIL)
diff --git a/run-tests.php b/run-tests.php
@@ -2089,8 +2089,10 @@ function run_test($php, $file, $env)
 	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';
 }

Original file line number	Diff line number	Diff line change
`@@ -2089,8 +2089,10 @@ function run_test($php, $file, $env)`
`2089`	`2089`	`if (isset($old_php)) {`
`2090`	`2090`	`$php = $old_php;`
`2091`	`2091`	`}`
	`2092`	`+`
	`2093`	`+ $diff = empty($diff) ? '' : "<![CDATA[\n " . preg_replace('/\e/', '<esc>', $diff) . "\n]]>";`
`2092`	`2094`
`2093`		`- junit_mark_test_as($restype, str_replace($cwd . '/', '', $tested_file), $tested, null, $info, "<![CDATA[\n " . preg_replace('/\e/', '<esc>', $diff) . "\n]]>");`
	`2095`	`+ junit_mark_test_as($restype, str_replace($cwd . '/', '', $tested_file), $tested, null, $info, $diff);`
`2094`	`2096`
`2095`	`2097`	`return $restype[0] . 'ED';`
`2096`	`2098`	`}`