From 1b83d882b44a13d2b89ab5765a7fe99f0524200b Mon Sep 17 00:00:00 2001
From: Doug Haber <doug@fawnanddoug.com>
Date: Fri, 10 Jan 2014 11:22:43 -0500
Subject: [PATCH 1/2] Fix some tests that were failing on my Mac

---
 build.gradle | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index b6ce6c2c..8a03d894 100644
--- a/build.gradle
+++ b/build.gradle
@@ -118,11 +118,6 @@ task clean << {
 }
 
 class DebugRhinoTest extends RhinoTest {
-    def suffix = ""
-
-    def expectedCssPath(lessFilePath) {
-      return lessFilePath.replace('.less', suffix+'.css').replace('\\less\\', '\\css\\'); //FIXME: now it works only on windows
-    }
 
     def escapeIt(it) {
       return it.replaceAll("\\\\", "\\\\\\\\").replaceAll("/", "\\\\/").replaceAll(":", "\\\\:").replaceAll("\\.", "\\\\.");
@@ -146,6 +141,7 @@ class RhinoTest extends DefaultTask {
         dependsOn 'setupTest'
     }
 
+    def suffix = ""
     def testDir = ''
     def options = []
     def expectErrors = false
@@ -165,7 +161,7 @@ class RhinoTest extends DefaultTask {
     }
 
     def expectedCssPath(lessFilePath) {
-      return lessFilePath.replace('.less', '.css').replace('\\less\\', '\\css\\');
+	  lessFilePath.replace('.less', "${suffix}.css").replace("${fs}less${fs}", "${fs}css${fs}");
     }
 
     def globalReplacements(input, directory) {
@@ -191,7 +187,7 @@ class RhinoTest extends DefaultTask {
     def runTest() {
         int testSuccesses = 0, testFailures = 0, testErrors = 0
         project.file('test/less/' + testDir).eachFileMatch(FileType.FILES, ~/.*\.less/) { lessFile ->
-            print lessFile
+            println "$lessFile"
             if (!project.hasProperty('test') || lessFile.name.startsWith(project.test)) {
                 def out = new java.io.ByteArrayOutputStream()
                 def execOptions = {
@@ -208,7 +204,7 @@ class RhinoTest extends DefaultTask {
                     def exec = project.javaexec(execOptions)
                     def actual = out.toString().trim()
                     def actualResult = project.file(lessFile.path.replace('test/less', project.testOut).replace('.less', '.css'))
-
+					
                     project.file(actualResult.parent).mkdirs()
                     actualResult << actual
                     def expected
@@ -235,6 +231,7 @@ class RhinoTest extends DefaultTask {
 //                        println "* expected *" 
 //                        println expected
 //                        new File("expected.txt").write(expected)
+					
                     assert actual == expected
                     testSuccesses++
                     println stylize('   ok', 'green')

From fb1f664388693a263b75b52fb8befd833ee11a14 Mon Sep 17 00:00:00 2001
From: Doug Haber <doug@fawnanddoug.com>
Date: Fri, 10 Jan 2014 11:30:44 -0500
Subject: [PATCH 2/2] Clean up some text changes

---
 build.gradle | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8a03d894..4929d951 100644
--- a/build.gradle
+++ b/build.gradle
@@ -187,7 +187,7 @@ class RhinoTest extends DefaultTask {
     def runTest() {
         int testSuccesses = 0, testFailures = 0, testErrors = 0
         project.file('test/less/' + testDir).eachFileMatch(FileType.FILES, ~/.*\.less/) { lessFile ->
-            println "$lessFile"
+            print lessFile
             if (!project.hasProperty('test') || lessFile.name.startsWith(project.test)) {
                 def out = new java.io.ByteArrayOutputStream()
                 def execOptions = {
@@ -204,7 +204,7 @@ class RhinoTest extends DefaultTask {
                     def exec = project.javaexec(execOptions)
                     def actual = out.toString().trim()
                     def actualResult = project.file(lessFile.path.replace('test/less', project.testOut).replace('.less', '.css'))
-					
+
                     project.file(actualResult.parent).mkdirs()
                     actualResult << actual
                     def expected
@@ -231,7 +231,6 @@ class RhinoTest extends DefaultTask {
 //                        println "* expected *" 
 //                        println expected
 //                        new File("expected.txt").write(expected)
-					
                     assert actual == expected
                     testSuccesses++
                     println stylize('   ok', 'green')