Submodules: Updated submodules. (sass#510)

* Additions in the binding.gyp. * Updated CLI test for line endings. * Updated Appveyor.yml as per @FeodorFitsner's suggestion.
am11 · Nov 5, 2014 · 403d6c1 · 403d6c1
1 parent dd0d743
commit 403d6c1
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -17,6 +17,6 @@ install:
 test_script:
   - node --version
   - npm --version
-  - ps: npm test
+  - npm test
 
 build: off
diff --git a/binding.gyp b/binding.gyp
@@ -8,6 +8,7 @@
         'src/libsass/ast.cpp',
         'src/libsass/base64vlq.cpp',
         'src/libsass/bind.cpp',
+        'src/libsass/cencode.c',
         'src/libsass/constants.cpp',
         'src/libsass/context.cpp',
         'src/libsass/contextualize.cpp',
@@ -19,6 +20,7 @@
         'src/libsass/file.cpp',
         'src/libsass/functions.cpp',
         'src/libsass/inspect.cpp',
+        'src/libsass/json.cpp',
         'src/libsass/node.cpp',
         'src/libsass/output_compressed.cpp',
         'src/libsass/output_nested.cpp',

diff --git a/src/libsass b/src/libsass
diff --git a/test/cli.js b/test/cli.js
@@ -162,7 +162,7 @@ describe('cli', function() {
     it('should compile with the --source-map option', function(done) {
       var src = fixture('source-map/index.scss');
       var dest = fixture('source-map/build.css');
-      var expected = read(fixture('source-map/expected.css'), 'utf8').trim();
+      var expected = read(fixture('source-map/expected.css'), 'utf8').trim().replace(/\r\n/g, '\n');
       var map = fixture('source-map/index.map');
       var bin = spawn(cli, [src, '--output', dest, '--source-map', map]);
 

diff --git a/test/fixtures/spec b/test/fixtures/spec