[Fusionforge-commits] r11800 - trunk/tests/code/syntax

Roland Mas lolando at libremir.placard.fr.eu.org
Tue Dec 14 17:47:22 CET 2010


Author: lolando
Date: 2010-12-14 17:47:21 +0100 (Tue, 14 Dec 2010)
New Revision: 11800

Modified:
   trunk/tests/code/syntax/SyntaxTest.php
Log:
Added check for SVN conflict markers

Modified: trunk/tests/code/syntax/SyntaxTest.php
===================================================================
--- trunk/tests/code/syntax/SyntaxTest.php	2010-12-14 16:32:48 UTC (rev 11799)
+++ trunk/tests/code/syntax/SyntaxTest.php	2010-12-14 16:47:21 UTC (rev 11800)
@@ -68,6 +68,18 @@
     }
 
     /**
+     * Ensure no scripts have SVN conflicts markers
+     */
+    public function testSVNConflicts()
+    {
+	    $root = dirname(dirname(dirname(dirname(__FILE__))));
+	    $output = `find $root/src $root/tests -type f | xargs grep -l '^<<<<<<'`;
+	    $this->assertEquals('', $output);
+	    $output = `find $root/src $root/tests -type f | xargs grep -l '^>>>>>>'`;
+	    $this->assertEquals('', $output);
+    }
+
+    /**
      * Ensure no script has an empty last line
      */
     public function testEmptyLastLine()




More information about the Fusionforge-commits mailing list