Revert "Bump LibSass@3.5.3 (#2342)"

This reverts commit 8004d10.

Author: xzyfer

package.json

@@ -1,7 +1,7 @@
 {
   "name": "node-sass",
   "version": "4.9.0",
-  "libsass": "3.5.3",
+  "libsass": "3.5.2",
   "description": "Wrapper around libsass",
   "license": "MIT",
   "bugs": "https://github.com/sass/node-sass/issues",
@@ -83,7 +83,7 @@
     "object-merge": "^2.5.1",
     "read-yaml": "^1.0.0",
     "rimraf": "^2.5.2",
-    "sass-spec": "3.5.1",
+    "sass-spec": "^3.5.1",
     "unique-temp-dir": "^1.0.0"
   }
 }

src/libsass/GNUmakefile.am

@@ -25,49 +25,63 @@ else
   AM_CXXFLAGS += -std=c++0x
 endif
 
-TEST_EXTENSIONS = .rb
-
 if ENABLE_TESTS
 
-SASS_SASSC_PATH ?= $(top_srcdir)/sassc
-SASS_SPEC_PATH ?= $(top_srcdir)/sass-spec
-
 noinst_PROGRAMS = tester
+
 tester_LDADD = src/libsass.la
+tester_SOURCES = $(SASS_SASSC_PATH)/sassc.c
+tester_VERSION ?= `cd "$(SASS_SASSC_PATH)" && ./version.sh`
+tester_CFLAGS = $(AM_CFLAGS) -DSASSC_VERSION="\"$(tester_VERSION)\""
+tester_CXXFLAGS = $(AM_CXXFLAGS) -DSASSC_VERSION="\"$(tester_VERSION)\""
 tester_LDFLAGS = $(AM_LDFLAGS)
-nodist_tester_SOURCES = $(SASS_SASSC_PATH)/sassc.c
-SASS_SASSC_VERSION ?= `cd "$(SASS_SASSC_PATH)" && ./version.sh`
-tester_CFLAGS = $(AM_CFLAGS) -DSASSC_VERSION="\"$(SASS_SASSC_VERSION)\""
-tester_CXXFLAGS = $(AM_CXXFLAGS) -DSASSC_VERSION="\"$(SASS_SASSC_VERSION)\""
 
 if ENABLE_COVERAGE
 nodist_EXTRA_tester_SOURCES = non-existent-file-to-force-CXX-linking.cxx
 endif
 
-TESTS = $(SASS_SPEC_PATH)/sass-spec.rb
-RB_LOG_COMPILER = ./script/tap-runner
-AM_RB_LOG_FLAGS = $(RUBY)
+SASS_SASSC_PATH ?= $(top_srcdir)/sassc
+SASS_SPEC_PATH ?= $(top_srcdir)/sass-spec
+
+TESTS = \
+	$(SASS_SPEC_PATH)/spec/basic \
+	$(SASS_SPEC_PATH)/spec/css \
+	$(SASS_SPEC_PATH)/spec/extend-tests \
+	$(SASS_SPEC_PATH)/spec/extends \
+	$(SASS_SPEC_PATH)/spec/libsass \
+	$(SASS_SPEC_PATH)/spec/libsass-closed-issues \
+	$(SASS_SPEC_PATH)/spec/maps \
+	$(SASS_SPEC_PATH)/spec/misc \
+	$(SASS_SPEC_PATH)/spec/regressions \
+	$(SASS_SPEC_PATH)/spec/scss \
+	$(SASS_SPEC_PATH)/spec/scss-tests \
+	$(SASS_SPEC_PATH)/spec/types
 
 SASS_TEST_FLAGS = -V 3.5 --impl libsass
-SASS_TEST_FLAGS += -r $(SASS_SPEC_PATH)
-SASS_TEST_FLAGS += -c $(top_srcdir)/tester$(EXEEXT)
-AM_TESTS_ENVIRONMENT = TEST_FLAGS='$(SASS_TEST_FLAGS)'
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) ./script/tap-driver
+AM_LOG_FLAGS = -c ./tester $(LOG_FLAGS)
+if USE_TAP
+	AM_LOG_FLAGS += -t
+	SASS_TEST_FLAGS += -t | tapout
+	LOG_COMPILER = ./script/tap-runner $(RUBY) $(SASS_SPEC_PATH)/sass-spec.rb
+else
+	LOG_COMPILER = $(RUBY) $(SASS_SPEC_PATH)/sass-spec.rb
+endif
 
 SASS_TESTER = $(RUBY) $(SASS_SPEC_PATH)/sass-spec.rb
+SASS_TESTER += -c $(top_srcdir)/tester$(EXEEXT)
 
 test:
-	$(SASS_TESTER) $(SASS_TEST_FLAGS)
+	$(SASS_TESTER) $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS)
 
 test_build:
-	$(SASS_TESTER) $(SASS_TEST_FLAGS)
+	$(SASS_TESTER) $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS)
 
 test_full:
-	$(SASS_TESTER) --run-todo $(SASS_TEST_FLAGS)
+	$(SASS_TESTER) --run-todo $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS)
 
 test_probe:
-	$(SASS_TESTER) --probe-todo $(SASS_TEST_FLAGS)
-
-.PHONY: test test_build test_full test_probe
+	$(SASS_TESTER) --probe-todo $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS)
 
 endif