less 2.4.0 → 2.5.0

data/lib/less/js/test/css/mixins-interpolated.css

@@ -0,0 +1,39 @@
+.foo {
+  a: 1;
+}
+.foo {
+  a: 2;
+}
+#foo {
+  a: 3;
+}
+#foo {
+  a: 4;
+}
+mi-test-a {
+  a: 1;
+  a: 2;
+  a: 3;
+  a: 4;
+}
+.b .bb.foo-xxx .yyy-foo#foo .foo.bbb {
+  b: 1;
+}
+mi-test-b {
+  b: 1;
+}
+#foo-foo > .bar .baz {
+  c: c;
+}
+mi-test-c-1 > .bar .baz {
+  c: c;
+}
+mi-test-c-2 .baz {
+  c: c;
+}
+mi-test-c-3 {
+  c: c;
+}
+mi-test-d {
+  gender: "Male";
+}

data/lib/less/js/test/css/mixins.css

@@ -64,11 +64,31 @@
 .amp.support {
   color: orange;
 }
+.amp.support .higher {
+  top: 0px;
+}
+.amp.support.deeper {
+  height: auto;
+}
 .extended {
   width: 100%;
   border: 1px;
   background: none;
   color: orange;
+  top: 0px;
+  height: auto;
+}
+.extended .higher {
+  top: 0px;
+}
+.extended.deeper {
+  height: auto;
+}
+.do .re .mi .fa .sol .la .si {
+  color: cyan;
+}
+.mutli-selector-parents {
+  color: cyan;
 }
 .foo .bar {
   width: 100%;

data/lib/less/js/test/css/modifyVars/extended.css

@@ -0,0 +1,9 @@
+#header {
+  color: #333333;
+  border-left: 1px;
+  border-right: 2px;
+}
+#footer {
+  color: #114411;
+  border-color: #842210;
+}

data/lib/less/js/test/css/parens.css

@@ -31,3 +31,6 @@
   margin: 2px 4em 1 5pc;
   padding: 6px 1em 2px 2;
 }
+.test-false-negatives {
+  a: (;
+}

data/lib/less/js/test/css/property-name-interp.css

@@ -0,0 +1,20 @@
+pi-test {
+  border: 0;
+  ufo-width: 50%;
+  *-z-border: 1px dashed blue;
+  -www-border-top: 2px;
+  radius-is-not-a-border: true;
+  border-top-left-radius: 2em;
+  border-top-red-radius-: 3pt;
+  global-local-mixer-property: strong;
+}
+pi-test-merge {
+  pre-property-ish: high, middle, low, base;
+  pre-property-ish+: nice try dude;
+}
+pi-indirect-vars {
+  auto: auto;
+}
+pi-complex-values {
+  3px rgba(255, 255, 0, 0.5), 3.141592653589793 /* foo */3px rgba(255, 255, 0, 0.5), 3.141592653589793 /* foo */: none;
+}

data/lib/less/js/test/css/selectors.css

@@ -129,6 +129,7 @@ p a span {
   color: #ff0000;
 }
 [prop],
+[prop=10%],
 [prop="value3"],
 [prop*="val3"],
 [|prop~="val3"],
@@ -139,3 +140,14 @@ p a span {
 [3] {
   attributes: yes;
 }
+/*
+Large comment means chunk will be emitted after } which means chunk will begin with whitespace...
+blank blank blank blank blank blank blank blank blank blank blank blank blank blank blank blank
+blank blank blank blank blank blank blank blank blank blank blank blank blank blank blank blank
+blank blank blank blank blank blank blank blank blank blank blank blank blank blank blank blank
+blank blank blank blank blank blank blank blank blank blank blank blank blank blank blank blank
+blank blank blank blank blank blank blank blank blank blank blank blank blank blank blank blank
+*/
+.blood {
+  color: red;
+}

data/lib/less/js/test/css/static-urls/urls.css

@@ -1,5 +1,4 @@
-@import "folder (1)/../css/background.css";
-
+@import "css/background.css";
 @import "folder (1)/import-test-d.css";
 @font-face {
   src: url("/fonts/garamond-pro.ttf");
@@ -31,12 +30,16 @@
 #logo {
   width: 100px;
   height: 100px;
-  background: url('folder (1)/../assets/logo.png');
+  background: url('assets/logo.png');
 }
 @font-face {
   font-family: xecret;
-  src: url('folder (1)/../assets/xecret.ttf');
+  src: url('assets/xecret.ttf');
 }
 #secret {
   font-family: xecret, sans-serif;
 }
+#imported-relative-path {
+  background-image: url(../data/image.jpg);
+  border-image: url('../data/image.jpg');
+}

data/lib/less/js/test/css/strings.css

@@ -38,3 +38,6 @@
   color: #000000;
   color: #ffa500;
 }
+.watermark {
+  family: Univers, Arial, Verdana, San-Serif;
+}

data/lib/less/js/test/css/url-args/urls.css

@@ -0,0 +1,56 @@
+@font-face {
+  src: url("/fonts/garamond-pro.ttf?424242");
+  src: local(Futura-Medium), url(fonts.svg?424242#MyGeometricModern) format("svg");
+}
+#shorthands {
+  background: url("http://www.lesscss.org/spec.html?424242") no-repeat 0 4px;
+  background: url("img.jpg?424242") center / 100px;
+  background: #ffffff url(image.png?424242) center / 1px 100px repeat-x scroll content-box padding-box;
+}
+#misc {
+  background-image: url(images/image.jpg?424242);
+}
+#data-uri {
+  background: url(data:image/png;charset=utf-8;base64,
+    kiVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAABlBMVEUAAAD/
+    k//+l2Z/dAAAAM0lEQVR4nGP4/5/h/1+G/58ZDrAz3D/McH8yw83NDDeNGe4U
+    kg9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC);
+  background-image: url(data:image/x-png,f9difSSFIIGFIFJD1f982FSDKAA9==);
+  background-image: url(http://fonts.googleapis.com/css?family=\"Rokkitt\":\(400\),700&424242);
+  background-image: url("http://fonts.googleapis.com/css?family=\"Rokkitt\":\(400\),700&424242");
+}
+#svg-data-uri {
+  background: transparent url('data:image/svg+xml, <svg version="1.1"><g></g></svg>');
+}
+.comma-delimited {
+  background: url(bg.jpg?424242) no-repeat, url(bg.png?424242) repeat-x top left, url(bg?424242);
+}
+.values {
+  url: url('Trebuchet?424242');
+}
+@font-face {
+  font-family: xecret;
+  src: url('../assets/xecret.ttf?424242');
+}
+#secret {
+  font-family: xecret, sans-serif;
+}
+#data-uri {
+  uri: url("data:image/jpeg;base64,bm90IGFjdHVhbGx5IGEganBlZyBmaWxlCg==");
+}
+#data-uri-guess {
+  uri: url("data:image/jpeg;base64,bm90IGFjdHVhbGx5IGEganBlZyBmaWxlCg==");
+}
+#data-uri-ascii {
+  uri-1: url("data:text/html,%3Ch1%3EThis%20page%20is%20100%25%20Awesome.%3C%2Fh1%3E%0A");
+  uri-2: url("data:text/html,%3Ch1%3EThis%20page%20is%20100%25%20Awesome.%3C%2Fh1%3E%0A");
+}
+#svg-functions {
+  background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2ZXJzaW9uPSIxLjEiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZ3JhZGllbnQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjwvbGluZWFyR3JhZGllbnQ+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkaWVudCkiIC8+PC9zdmc+');
+  background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2ZXJzaW9uPSIxLjEiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZ3JhZGllbnQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIvPjxzdG9wIG9mZnNldD0iMyUiIHN0b3AtY29sb3I9IiNmZmE1MDAiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmZmZmZmYiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZ3JhZGllbnQpIiAvPjwvc3ZnPg==');
+  background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2ZXJzaW9uPSIxLjEiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZ3JhZGllbnQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIxJSIgc3RvcC1jb2xvcj0iI2M0YzRjNCIvPjxzdG9wIG9mZnNldD0iMyUiIHN0b3AtY29sb3I9IiNmZmE1MDAiLz48c3RvcCBvZmZzZXQ9IjUlIiBzdG9wLWNvbG9yPSIjMDA4MDAwIi8+PHN0b3Agb2Zmc2V0PSI5NSUiIHN0b3AtY29sb3I9IiNmZmZmZmYiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZ3JhZGllbnQpIiAvPjwvc3ZnPg==');
+}
+#data-uri-with-spaces {
+  background-image: url(data:image/x-png,f9difSSFIIGFIFJD1f982FSDKAA9==);
+  background-image: url(' data:image/x-png,f9difSSFIIGFIFJD1f982FSDKAA9==');
+}

data/lib/less/js/test/css/urls.css

@@ -1,7 +1,5 @@
-@import "import/../css/background.css";
-
+@import "css/background.css";
 @import "import/import-test-d.css";
-
 @import "file.css";
 @font-face {
   src: url("/fonts/garamond-pro.ttf");
@@ -22,6 +20,7 @@
     kg9C9zwz3gVLMDA/A6P9/AFGGFyjOXZtQAAAAAElFTkSuQmCC);
   background-image: url(data:image/x-png,f9difSSFIIGFIFJD1f982FSDKAA9==);
   background-image: url(http://fonts.googleapis.com/css?family=\"Rokkitt\":\(400\),700);
+  background-image: url("http://fonts.googleapis.com/css?family=\"Rokkitt\":\(400\),700");
 }
 #svg-data-uri {
   background: transparent url('data:image/svg+xml, <svg version="1.1"><g></g></svg>');
@@ -35,25 +34,38 @@
 #logo {
   width: 100px;
   height: 100px;
-  background: url('import/imports/../assets/logo.png');
+  background: url('import/assets/logo.png');
 }
 @font-face {
   font-family: xecret;
-  src: url('import/imports/../assets/xecret.ttf');
+  src: url('import/assets/xecret.ttf');
 }
 #secret {
   font-family: xecret, sans-serif;
 }
+#imported-relative-path {
+  background-image: url(../data/image.jpg);
+  border-image: url('../data/image.jpg');
+}
+#relative-url-import {
+  background-image: url(../data/image.jpg);
+  border-image: url('../data/image.jpg');
+}
 #data-uri {
-  uri: url('data:image/jpeg;base64,bm90IGFjdHVhbGx5IGEganBlZyBmaWxlCg==');
+  uri: url("data:image/jpeg;base64,bm90IGFjdHVhbGx5IGEganBlZyBmaWxlCg==");
 }
 #data-uri-guess {
-  uri: url('data:image/jpeg;base64,bm90IGFjdHVhbGx5IGEganBlZyBmaWxlCg==');
+  uri: url("data:image/jpeg;base64,bm90IGFjdHVhbGx5IGEganBlZyBmaWxlCg==");
 }
 #data-uri-ascii {
-  uri-1: url('data:text/html,%3Ch1%3EThis%20page%20is%20100%25%20Awesome.%3C%2Fh1%3E%0A');
-  uri-2: url('data:text/html,%3Ch1%3EThis%20page%20is%20100%25%20Awesome.%3C%2Fh1%3E%0A');
+  uri-1: url("data:text/html,%3Ch1%3EThis%20page%20is%20100%25%20Awesome.%3C%2Fh1%3E%0A");
+  uri-2: url("data:text/html,%3Ch1%3EThis%20page%20is%20100%25%20Awesome.%3C%2Fh1%3E%0A");
 }
 #data-uri-toobig {
   uri: url('../data/data-uri-fail.png');
 }
+#svg-functions {
+  background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2ZXJzaW9uPSIxLjEiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZ3JhZGllbnQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iI2ZmZmZmZiIvPjwvbGluZWFyR3JhZGllbnQ+PHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkaWVudCkiIC8+PC9zdmc+');
+  background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2ZXJzaW9uPSIxLjEiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZ3JhZGllbnQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iIzAwMDAwMCIvPjxzdG9wIG9mZnNldD0iMyUiIHN0b3AtY29sb3I9IiNmZmE1MDAiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmZmZmZmYiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZ3JhZGllbnQpIiAvPjwvc3ZnPg==');
+  background-image: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/PjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2ZXJzaW9uPSIxLjEiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZ3JhZGllbnQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+PHN0b3Agb2Zmc2V0PSIxJSIgc3RvcC1jb2xvcj0iI2M0YzRjNCIvPjxzdG9wIG9mZnNldD0iMyUiIHN0b3AtY29sb3I9IiNmZmE1MDAiLz48c3RvcCBvZmZzZXQ9IjUlIiBzdG9wLWNvbG9yPSIjMDA4MDAwIi8+PHN0b3Agb2Zmc2V0PSI5NSUiIHN0b3AtY29sb3I9IiNmZmZmZmYiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZ3JhZGllbnQpIiAvPjwvc3ZnPg==');
+}

data/lib/less/js/test/index.js

@@ -0,0 +1,45 @@
+var lessTest = require("./less-test"),
+    lessTester = lessTest(),
+    path = require("path"),
+    stylize = require('../lib/less/lessc_helper').stylize;
+
+function getErrorPathReplacementFunction(dir) {
+    return function(input) {
+        return input.replace(
+                "{path}", path.join(process.cwd(), "/test/less/" + dir + "/"))
+            .replace("{pathrel}", path.join("test", "less", dir + "/"))
+            .replace("{pathhref}", "")
+            .replace("{404status}", "")
+            .replace(/\r\n/g, '\n');
+    };
+}
+
+console.log("\n" + stylize("LESS", 'underline') + "\n");
+lessTester.runTestSet({strictMath: true, relativeUrls: true, silent: true});
+lessTester.runTestSet({strictMath: true, strictUnits: true}, "errors/",
+    lessTester.testErrors, null, getErrorPathReplacementFunction("errors"));
+lessTester.runTestSet({strictMath: true, strictUnits: true, javascriptEnabled: false}, "no-js-errors/",
+    lessTester.testErrors, null, getErrorPathReplacementFunction("no-js-errors"));
+lessTester.runTestSet({strictMath: true, dumpLineNumbers: 'comments'}, "debug/", null,
+    function(name) { return name + '-comments'; });
+lessTester.runTestSet({strictMath: true, dumpLineNumbers: 'mediaquery'}, "debug/", null,
+    function(name) { return name + '-mediaquery'; });
+lessTester.runTestSet({strictMath: true, dumpLineNumbers: 'all'}, "debug/", null,
+    function(name) { return name + '-all'; });
+lessTester.runTestSet({strictMath: true, relativeUrls: false, rootpath: "folder (1)/"}, "static-urls/");
+lessTester.runTestSet({strictMath: true, compress: true}, "compression/");
+lessTester.runTestSet({}, "legacy/");
+lessTester.runTestSet({strictMath: true, strictUnits: true, sourceMap: true, globalVars: true }, "sourcemaps/",
+    lessTester.testSourcemap, null, null, 
+    function(filename, type) { 
+        if (type === "vars") {
+            return path.join('test/less/', filename) + '.json';
+        }
+        return path.join('test/sourcemaps', filename) + '.json'; 
+    });
+lessTester.runTestSet({globalVars: true, banner: "/**\n  * Test\n  */\n"}, "globalVars/",
+    null, null, null, function(name) { return path.join('test/less/', name) + '.json'; });
+lessTester.runTestSet({modifyVars: true}, "modifyVars/",
+    null, null, null, function(name) { return path.join('test/less/', name) + '.json'; });
+lessTester.runTestSet({urlArgs: '424242'}, "url-args/");
+lessTester.testNoOptions();

data/lib/less/js/test/less-test.js

@@ -1,214 +1,257 @@
-var path = require('path'),
-    fs = require('fs'),
-    sys = require('util');
+/*jshint latedef: nofunc */
 
-var less = require('../lib/less');
-var stylize = require('../lib/less/lessc_helper').stylize;
+module.exports = function() {
+    var path = require('path'),
+        fs = require('fs'),
+        sys = require('util');
 
-var globals = Object.keys(global);
+    var less = require('../lib/less');
+    var stylize = require('../lib/less/lessc_helper').stylize;
 
-var oneTestOnly = process.argv[2];
+    var globals = Object.keys(global);
 
-var totalTests = 0,
-    failedTests = 0,
-    passedTests = 0;
+    var oneTestOnly = process.argv[2];
 
-less.tree.functions.add = function (a, b) {
-    return new(less.tree.Dimension)(a.value + b.value);
-};
-less.tree.functions.increment = function (a) {
-    return new(less.tree.Dimension)(a.value + 1);
-};
-less.tree.functions._color = function (str) {
-    if (str.value === "evil red") { return new(less.tree.Color)("600") }
-};
+    var isVerbose = process.env.npm_config_loglevel === 'verbose';
 
-sys.puts("\n" + stylize("LESS", 'underline') + "\n");
+    var totalTests = 0,
+        failedTests = 0,
+        passedTests = 0;
 
-runTestSet({strictMath: true, relativeUrls: true, silent: true});
 
-runTestSet({strictMath: true, strictUnits: true}, "errors/", function(name, err, compiledLess, doReplacements) {
-    fs.readFile(path.join('test/less/', name) + '.txt', 'utf8', function (e, expectedErr) {
-        sys.print("- " + name + ": ");
-        expectedErr = doReplacements(expectedErr, 'test/less/errors/');
-        if (!err) {
-            if (compiledLess) {
-                fail("No Error", 'red');
+    less.tree.functions.add = function (a, b) {
+        return new(less.tree.Dimension)(a.value + b.value);
+    };
+    less.tree.functions.increment = function (a) {
+        return new(less.tree.Dimension)(a.value + 1);
+    };
+    less.tree.functions._color = function (str) {
+        if (str.value === "evil red") { return new(less.tree.Color)("600"); }
+    };
+
+    function testSourcemap(name, err, compiledLess, doReplacements, sourcemap) {
+        fs.readFile(path.join('test/', name) + '.json', 'utf8', function (e, expectedSourcemap) {
+            sys.print("- " + name + ": ");
+            if (sourcemap === expectedSourcemap) {
+                ok('OK');
+            } else if (err) {
+                fail("ERROR: " + (err && err.message));
+                if (isVerbose) {
+                    console.error();
+                    console.error(err.stack);
+                }
             } else {
-                fail("No Error, No Output");
+                difference("FAIL", expectedSourcemap, sourcemap);
             }
-        } else {
-            var errMessage = less.formatError(err);
-            if (errMessage === expectedErr) {
-                ok('OK');                    
+        });
+    }
+
+    function testErrors(name, err, compiledLess, doReplacements) {
+        fs.readFile(path.join('test/less/', name) + '.txt', 'utf8', function (e, expectedErr) {
+            sys.print("- " + name + ": ");
+            expectedErr = doReplacements(expectedErr, 'test/less/errors/');
+            if (!err) {
+                if (compiledLess) {
+                    fail("No Error", 'red');
+                } else {
+                    fail("No Error, No Output");
+                }
             } else {
-                difference("FAIL", expectedErr, errMessage);
+                var errMessage = less.formatError(err);
+                if (errMessage === expectedErr) {
+                    ok('OK');
+                } else {
+                    difference("FAIL", expectedErr, errMessage);
+                }
             }
+        });
+    }
+
+    function globalReplacements(input, directory) {
+        var p = path.join(process.cwd(), directory),
+            pathimport = path.join(process.cwd(), directory + "import/"),
+            pathesc = p.replace(/[.:/\\]/g, function(a) { return '\\' + (a=='\\' ? '\/' : a); }),
+            pathimportesc = pathimport.replace(/[.:/\\]/g, function(a) { return '\\' + (a=='\\' ? '\/' : a); });
+
+        return input.replace(/\{path\}/g, p)
+                .replace(/\{pathesc\}/g, pathesc)
+                .replace(/\{pathimport\}/g, pathimport)
+                .replace(/\{pathimportesc\}/g, pathimportesc)
+                .replace(/\r\n/g, '\n');
+    }
+
+    function checkGlobalLeaks() {
+        return Object.keys(global).filter(function(v) {
+            return globals.indexOf(v) < 0;
+        });
+    }
+
+    function runTestSet(options, foldername, verifyFunction, nameModifier, doReplacements, getFilename) {
+        foldername = foldername || "";
+
+        if(!doReplacements) {
+            doReplacements = globalReplacements;
         }
-        sys.puts("");
-    });}, null, function(input, directory) {
-        return input.replace(
-            "{path}", path.join(process.cwd(), "/test/less/errors/"))
-            .replace("{pathrel}", path.join("test", "less", "errors/"))
-            .replace("{pathhref}", "")
-            .replace("{404status}", "")
-            .replace(/\r\n/g, '\n');
-    });
-
-runTestSet({strictMath: true, dumpLineNumbers: 'comments'}, "debug/", null,
-           function(name) { return name + '-comments'; });
-runTestSet({strictMath: true, dumpLineNumbers: 'mediaquery'}, "debug/", null,
-           function(name) { return name + '-mediaquery'; });
-runTestSet({strictMath: true, dumpLineNumbers: 'all'}, "debug/", null,
-           function(name) { return name + '-all'; });
-runTestSet({strictMath: true, relativeUrls: false, rootpath: "folder (1)/"}, "static-urls/");
-runTestSet({strictMath: true, compress: true}, "compression/");
-runTestSet({ }, "legacy/");
-testNoOptions();
-
-function globalReplacements(input, directory) {
-    var p = path.join(process.cwd(), directory),
-        pathimport = path.join(process.cwd(), directory + "import/"),
-        pathesc = p.replace(/[.:/\\]/g, function(a) { return '\\' + (a=='\\' ? '\/' : a); }),
-        pathimportesc = pathimport.replace(/[.:/\\]/g, function(a) { return '\\' + (a=='\\' ? '\/' : a); });
-
-    return input.replace(/\{path\}/g, p)
-            .replace(/\{pathesc\}/g, pathesc)
-            .replace(/\{pathimport\}/g, pathimport)
-            .replace(/\{pathimportesc\}/g, pathimportesc)
-            .replace(/\r\n/g, '\n');
-}
-
-function checkGlobalLeaks() {
-    return Object.keys(global).filter(function(v) {
-        return globals.indexOf(v) < 0;
-    });
-}
-
-function runTestSet(options, foldername, verifyFunction, nameModifier, doReplacements) {
-    foldername = foldername || "";
-
-    if(!doReplacements)
-        doReplacements = globalReplacements;
-
-    fs.readdirSync(path.join('test/less/', foldername)).forEach(function (file) {
-        if (! /\.less/.test(file)) { return }
-        
-        var name = foldername + path.basename(file, '.less');
-        
-        if (oneTestOnly && name !== oneTestOnly) { return; }
-        
-        totalTests++;
 
-        toCSS(options, path.join('test/less/', foldername + file), function (err, less) {
+        function getBasename(file) {
+             return foldername + path.basename(file, '.less');
+        }
+
+        fs.readdirSync(path.join('test/less/', foldername)).forEach(function (file) {
+            if (! /\.less/.test(file)) { return; }
+
+            var name = getBasename(file);
 
-            if (verifyFunction) {
-                return verifyFunction(name, err, less, doReplacements);
+            if (oneTestOnly && name !== oneTestOnly) {
+                return;
             }
-            var css_name = name;
-            if(nameModifier) css_name=nameModifier(name);
-            fs.readFile(path.join('test/css', css_name) + '.css', 'utf8', function (e, css) {
-                sys.print("- " + css_name + ": ")
-                
-                css = css && doReplacements(css, 'test/less/' + foldername);
-                if (less === css) { ok('OK'); }
-                else if (err) {
-                    fail("ERROR: " + (err && err.message));
-                } else {
-                    difference("FAIL", css, less);
+
+            totalTests++;
+
+            if (options.sourceMap) {
+                var sourceMapOutput;
+                options.writeSourceMap = function(output) {
+                    sourceMapOutput = output;
+                };
+                options.sourceMapOutputFilename = name + ".css";
+                options.sourceMapBasepath = path.join(process.cwd(), "test/less");
+                options.sourceMapRootpath = "testweb/";
+            }
+
+            options.getVars = function(file) {
+                return JSON.parse(fs.readFileSync(getFilename(getBasename(file), 'vars'), 'utf8'));
+            };
+
+            toCSS(options, path.join('test/less/', foldername + file), function (err, less) {
+
+                if (verifyFunction) {
+                    return verifyFunction(name, err, less, doReplacements, sourceMapOutput);
                 }
-                sys.puts("");
+                var css_name = name;
+                if(nameModifier) { css_name = nameModifier(name); }
+                fs.readFile(path.join('test/css', css_name) + '.css', 'utf8', function (e, css) {
+                    sys.print("- " + css_name + ": ");
+
+                    css = css && doReplacements(css, 'test/less/' + foldername);
+                    if (less === css) { ok('OK'); }
+                    else if (err) {
+                        fail("ERROR: " + (err && err.message));
+                        if (isVerbose) {
+                            console.error();
+                            console.error(err.stack);
+                        }
+                    } else {
+                        difference("FAIL", css, less);
+                    }
+                });
             });
         });
-    });
-}
-
-function diff(left, right) {
-    sys.puts("");
-    require('diff').diffLines(left, right).forEach(function(item) {
-      if(item.added || item.removed) {
-        sys.print(stylize(item.value, item.added ? 'green' : 'red'));
-      } else {
-        sys.print(item.value);
-      }
-    });
-}
-
-function fail(msg) {
-    sys.print(stylize(msg, 'red'));
-    failedTests++;
-    endTest();
-}
-
-function difference(msg, left, right) {
-    sys.print(stylize(msg, 'yellow'));
-    failedTests++;
-                
-    diff(left, right);
-    endTest();
-}
-
-function ok(msg) {
-    sys.print(stylize(msg, 'green'));
-    passedTests++;
-    endTest();
-}
-
-function endTest() {
-    var leaked = checkGlobalLeaks();
-    if (failedTests + passedTests === totalTests) {
-        sys.puts("");
-        sys.puts("");
-        if (failedTests > 0) {
-            sys.print(failedTests);
-            sys.print(stylize(" Failed", "red"));
-            sys.print(", " + passedTests + " passed");
-        } else {
-            sys.print(stylize("All Passed ", "green"));
-            sys.print(passedTests + " run");
-        }
-        if (leaked.length > 0) {
-            sys.puts("");
-            sys.puts("");
-            sys.print(stylize("Global leak detected: ", "red") + leaked.join(', '));
-            sys.print("\n");
-        }
     }
-}
-
-function toCSS(options, path, callback) {
-    var tree, css;
-    options = options || {};
-    fs.readFile(path, 'utf8', function (e, str) {
-        if (e) { return callback(e) }
-        
-        options.paths = [require('path').dirname(path)];
-        options.filename = require('path').resolve(process.cwd(), path);
-        options.optimization = options.optimization || 0;
-
-        new(less.Parser)(options).parse(str, function (err, tree) {
-            if (err) {
-                callback(err);
+
+    function diff(left, right) {
+        require('diff').diffLines(left, right).forEach(function(item) {
+          if(item.added || item.removed) {
+            var text = item.value.replace("\n", String.fromCharCode(182) + "\n");
+            sys.print(stylize(text, item.added ? 'green' : 'red'));
+          } else {
+            sys.print(item.value);
+          }
+        });
+        console.log("");
+    }
+
+    function fail(msg) {
+        console.error(stylize(msg, 'red'));
+        failedTests++;
+        endTest();
+    }
+
+    function difference(msg, left, right) {
+        console.warn(stylize(msg, 'yellow'));
+        failedTests++;
+
+        diff(left, right);
+        endTest();
+    }
+
+    function ok(msg) {
+        console.log(stylize(msg, 'green'));
+        passedTests++;
+        endTest();
+    }
+
+    function endTest() {
+        var leaked = checkGlobalLeaks();
+        if (failedTests + passedTests === totalTests) {
+            console.log("");
+            if (failedTests > 0) {
+                console.error(failedTests + stylize(" Failed", "red") + ", " + passedTests + " passed");
             } else {
-                try {
-                    css = tree.toCSS(options);
-                    callback(null, css);
-                } catch (e) {
-                    callback(e);
-                }
+                console.log(stylize("All Passed ", "green") + passedTests + " run");
             }
-        });
-    });
-}
-
-function testNoOptions() {
-    totalTests++;
-    try {
-        sys.print("- Integration - creating parser without options: ");
-        new(less.Parser);
-    } catch(e) {
-        fail(stylize("FAIL\n", "red"));
-        return;
+            if (leaked.length > 0) {
+                console.log("");
+                console.warn(stylize("Global leak detected: ", "red") + leaked.join(', '));
+            }
+
+            if (leaked.length || failedTests) {
+                //process.exit(1);
+                process.on('exit', function() { process.reallyExit(1) });
+            }
+        }
     }
-    ok(stylize("OK\n", "green"));
-}
+
+    function toCSS(options, path, callback) {
+        var css;
+        options = options || {};
+        fs.readFile(path, 'utf8', function (e, str) {
+            if (e) { return callback(e); }
+
+            options.paths = [require('path').dirname(path)];
+            options.filename = require('path').resolve(process.cwd(), path);
+            options.optimization = options.optimization || 0;
+
+            var parser = new(less.Parser)(options);
+            var additionalData = {};
+            if (options.globalVars) {
+                additionalData.globalVars = options.getVars(path);
+            } else if (options.modifyVars) {
+                additionalData.modifyVars = options.getVars(path);
+            }
+            if (options.banner) {
+                additionalData.banner = options.banner;
+            }
+            parser.parse(str, function (err, tree) {
+                if (err) {
+                    callback(err);
+                } else {
+                    try {
+                        css = tree.toCSS(options);
+                        callback(null, css);
+                    } catch (e) {
+                        callback(e);
+                    }
+                }
+                }, additionalData);
+            });
+    }
+
+    function testNoOptions() {
+        totalTests++;
+        try {
+            sys.print("- Integration - creating parser without options: ");
+            new(less.Parser)();
+        } catch(e) {
+            fail(stylize("FAIL\n", "red"));
+            return;
+        }
+        ok(stylize("OK\n", "green"));
+    }
+
+    return {
+        runTestSet: runTestSet,
+        testErrors: testErrors,
+        testSourcemap: testSourcemap,
+        testNoOptions: testNoOptions
+    };
+};