Commit 5a821c65 by Michael Mifsud

Merge pull request #1248 from xzyfer/trash/v3.4.2

Bump LibSass to 3.3.2
parents dd649d1d 2566e733
- -
os: Visual Studio 2015
branches: branches:
only: only:
- release - release
...@@ -34,7 +36,7 @@ ...@@ -34,7 +36,7 @@
- node --version - node --version
- npm --version - npm --version
- git submodule update --init --recursive - git submodule update --init --recursive
- npm install --msvs_version=2013 - npm install --msvs_version=2015
test_script: npm test test_script: npm test
...@@ -55,6 +57,8 @@ ...@@ -55,6 +57,8 @@
appveyor_repo_tag: true # deploy on tag push only appveyor_repo_tag: true # deploy on tag push only
- -
os: Visual Studio 2015
configuration: testing configuration: testing
platform: platform:
...@@ -83,6 +87,6 @@ ...@@ -83,6 +87,6 @@
- node --version - node --version
- npm --version - npm --version
- git submodule update --init --recursive - git submodule update --init --recursive
- npm install --msvs_version=2013 - npm install --msvs_version=2015
test_script: npm test test_script: npm test
{ {
"name": "node-sass", "name": "node-sass",
"version": "3.4.1", "version": "3.4.1",
"libsass": "3.3.1", "libsass": "3.3.2",
"description": "Wrapper around libsass", "description": "Wrapper around libsass",
"license": "MIT", "license": "MIT",
"homepage": "https://github.com/sass/node-sass", "homepage": "https://github.com/sass/node-sass",
......
Subproject commit 42e22fbadfcdc8ac3b983890518dfa0ebff3c229 Subproject commit f47645c2ebb98c9e0c970f59820b239ab417dda3
Subproject commit ca5bcb22e9ff72ca6578f115e42efed1b2da7d38 Subproject commit b089cff39e623de5c6d3c88ad021220df5c67657
...@@ -39,10 +39,20 @@ module.exports.getSuites = function() { ...@@ -39,10 +39,20 @@ module.exports.getSuites = function() {
tests.forEach(function(test) { tests.forEach(function(test) {
var testPath = join(suitePath, test); var testPath = join(suitePath, test);
var hasErrorFile = fs.existsSync(join(testPath, 'error'));
var hasError = false;
if (hasErrorFile) {
var errorFileContents = fs.readFileSync(join(testPath, 'error')).toString();
hasError = !(
errorFileContents.match(/^DEPRECATION WARNING/) ||
errorFileContents.match(/^WARNING:/) ||
errorFileContents.match(/^.*?\/input.scss:\d+ DEBUG:/)
);
}
ret[suite][test] = {}; ret[suite][test] = {};
ret[suite][test].src = join(testPath, 'input.scss'); ret[suite][test].src = join(testPath, 'input.scss');
ret[suite][test].error = fs.existsSync(join(testPath, 'error')); ret[suite][test].error = hasErrorFile && hasError;
ret[suite][test].expected = join(testPath, 'expected_output.css'); ret[suite][test].expected = join(testPath, 'expected_output.css');
ret[suite][test].paths = [ ret[suite][test].paths = [
testPath, testPath,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment