From 596c73c683e45666934c5141ad088d2eb7ab248f Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Sun, 11 Oct 2009 09:01:36 +0000 Subject: [PATCH] BUGFIX: Improved reliability of PhpSyntaxTest on build slave. git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88522 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- tests/PhpSyntaxTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/PhpSyntaxTest.php b/tests/PhpSyntaxTest.php index dc42cd201..5fb982de7 100644 --- a/tests/PhpSyntaxTest.php +++ b/tests/PhpSyntaxTest.php @@ -25,7 +25,7 @@ class PhpSyntaxTest extends SapphireTest { $returnCode = 0; $output = array(); exec("php -l -d $settingTest $CLI_file", $output, $returnCode); - $hasErrors = ($returnCode != 0 && strpos('No syntax errors detected', $returnCode) === FALSE); + $hasErrors = ($returnCode != 0 && strpos('No syntax errors detected', implode("\n", $output)) === FALSE); $this->assertFalse($hasErrors, "Syntax error parsing $CLI_file with setting $settingTest:\n" . implode("\n", $output) . " (Returned: {$returnCode})"); } }