Skip to content

Commit 9515008

Browse files
mgretermgreter
authored
Merge pull request #3077 from mgreter/feature/libsass-spec-ci
Add new libsass spec repository to CI test
2 parents 8f59b01 + 83c9e92 commit 9515008

File tree

3 files changed

+70
-4
lines changed

3 files changed

+70
-4
lines changed

‎GNUmakefile.am

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ if ENABLE_TESTS
2929

3030
SASS_SASSC_PATH ?= $(top_srcdir)/sassc
3131
SASS_SPEC_PATH ?= $(top_srcdir)/sass-spec
32+
LIBSASS_SPEC_PATH ?= $(top_srcdir)/libsass-spec
3233

3334
noinst_PROGRAMS = tester
3435
tester_LDADD = src/libsass.la
@@ -49,24 +50,41 @@ AM_RB_LOG_FLAGS = $(RUBY)
4950
SASS_TEST_FLAGS = --impl libsass
5051
SASS_TEST_FLAGS += -r $(SASS_SPEC_PATH)/spec
5152
SASS_TEST_FLAGS += -c $(top_srcdir)/tester$(EXEEXT)
53+
LIBSASS_TEST_FLAGS = --impl libsass
54+
LIBSASS_TEST_FLAGS += -r $(LIBSASS_SPEC_PATH)/spec
55+
LIBSASS_TEST_FLAGS += -c $(top_srcdir)/tester$(EXEEXT)
56+
COMPRESSED_TEST_FLAGS = --impl libsass
57+
COMPRESSED_TEST_FLAGS += -r $(LIBSASS_SPEC_PATH)/styles/compressed
58+
COMPRESSED_TEST_FLAGS += -c $(top_srcdir)/tester$(EXEEXT)
59+
COMPRESSED_TEST_FLAGS += --cmd-args="-t compressed"
5260
AM_TESTS_ENVIRONMENT = TEST_FLAGS='$(SASS_TEST_FLAGS)'
5361

5462
SASS_TESTER = $(RUBY) $(SASS_SPEC_PATH)/sass-spec.rb
5563

5664
test:
5765
$(SASS_TESTER) $(SASS_TEST_FLAGS)
66+
$(SASS_TESTER) $(LIBSASS_TEST_FLAGS)
67+
$(SASS_TESTER) $(COMPRESSED_TEST_FLAGS)
5868

5969
test_build:
6070
$(SASS_TESTER) $(SASS_TEST_FLAGS)
71+
$(SASS_TESTER) $(LIBSASS_TEST_FLAGS)
72+
$(SASS_TESTER) $(COMPRESSED_TEST_FLAGS)
6173

6274
test_full:
6375
$(SASS_TESTER) --run-todo $(SASS_TEST_FLAGS)
76+
$(SASS_TESTER) --run-todo $(LIBSASS_TEST_FLAGS)
77+
$(SASS_TESTER) --run-todo $(COMPRESSED_TEST_FLAGS)
6478

6579
test_probe:
6680
$(SASS_TESTER) --probe-todo $(SASS_TEST_FLAGS)
81+
$(SASS_TESTER) --probe-todo $(LIBSASS_TEST_FLAGS)
82+
$(SASS_TESTER) --probe-todo $(COMPRESSED_TEST_FLAGS)
6783

6884
test_interactive:
6985
$(SASS_TESTER) --interactive $(SASS_TEST_FLAGS)
86+
$(SASS_TESTER) --interactive $(LIBSASS_TEST_FLAGS)
87+
$(SASS_TESTER) --interactive $(COMPRESSED_TEST_FLAGS)
7088

7189
.PHONY: test test_build test_full test_probe
7290

‎Makefile

Lines changed: 48 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,8 @@ endif
143143
SASS_SASSC_PATH ?= sassc
144144
SASS_SPEC_PATH ?= sass-spec
145145
SASS_SPEC_SPEC_DIR ?= spec
146+
LIBSASS_SPEC_PATH ?= libsass-spec
147+
LIBSASS_SPEC_SPEC_DIR ?= spec
146148
SASSC_BIN = $(SASS_SASSC_PATH)/bin/sassc
147149
RUBY_BIN = ruby
148150

@@ -289,25 +291,67 @@ version: $(SASSC_BIN)
289291

290292
test: test_build
291293

292-
test_build: $(SASSC_BIN)
294+
$(SASS_SPEC_PATH):
295+
git clone https://github.com/sass/sass-spec $(SASS_SPEC_PATH)
296+
297+
$(LIBSASS_SPEC_PATH):
298+
git clone https://github.com/mgreter/libsass-spec $(LIBSASS_SPEC_PATH)
299+
300+
test_build: $(SASSC_BIN) $(SASS_SPEC_PATH) $(LIBSASS_SPEC_PATH)
293301
$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
294302
--cmd-args "-I $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)" \
295303
$(LOG_FLAGS) $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)
304+
$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
305+
--cmd-args "-I $(LIBSASS_SPEC_PATH)/$(LIBSASS_SPEC_SPEC_DIR)" \
306+
$(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/$(LIBSASS_SPEC_SPEC_DIR)
307+
$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
308+
--cmd-args "-I $(LIBSASS_SPEC_PATH)/styles/compressed -t compressed" \
309+
$(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/styles/compressed
310+
$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
311+
--cmd-args "-I $(LIBSASS_SPEC_PATH)/styles/nested -t nested" \
312+
$(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/styles/nested
296313

297-
test_full: $(SASSC_BIN)
314+
test_full: $(SASSC_BIN) $(SASS_SPEC_PATH) $(LIBSASS_SPEC_PATH)
298315
$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
299316
--cmd-args "-I $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)" \
300317
--run-todo $(LOG_FLAGS) $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)
318+
$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
319+
--cmd-args "-I $(LIBSASS_SPEC_PATH)/$(LIBSASS_SPEC_SPEC_DIR)" \
320+
--run-todo $(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/$(LIBSASS_SPEC_SPEC_DIR)
321+
$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
322+
--cmd-args "-I $(LIBSASS_SPEC_PATH)/styles/compressed -t compressed" \
323+
--run-todo $(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/styles/compressed
324+
$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
325+
--cmd-args "-I $(LIBSASS_SPEC_PATH)/styles/nested -t nested" \
326+
--run-todo $(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/styles/nested
301327

302-
test_probe: $(SASSC_BIN)
328+
test_probe: $(SASSC_BIN) $(SASS_SPEC_PATH) $(LIBSASS_SPEC_PATH)
303329
$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
304330
--cmd-args "-I $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)" \
305331
--probe-todo $(LOG_FLAGS) $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)
332+
$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
333+
--cmd-args "-I $(LIBSASS_SPEC_PATH)/$(LIBSASS_SPEC_SPEC_DIR)" \
334+
--probe-todo $(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/$(LIBSASS_SPEC_SPEC_DIR)
335+
$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
336+
--cmd-args "-I $(LIBSASS_SPEC_PATH)/styles/compressed -t compressed" \
337+
--probe-todo $(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/styles/compressed
338+
$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
339+
--cmd-args "-I $(LIBSASS_SPEC_PATH)/styles/nested -t nested" \
340+
--probe-todo $(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/styles/nested
306341

307-
test_interactive: $(SASSC_BIN)
342+
test_interactive: $(SASSC_BIN) $(SASS_SPEC_PATH) $(LIBSASS_SPEC_PATH)
308343
$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
309344
--cmd-args "-I $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)" \
310345
--interactive $(LOG_FLAGS) $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)
346+
$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
347+
--cmd-args "-I $(LIBSASS_SPEC_PATH)/$(LIBSASS_SPEC_SPEC_DIR)" \
348+
--interactive $(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/$(LIBSASS_SPEC_SPEC_DIR)
349+
$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
350+
--cmd-args "-I $(LIBSASS_SPEC_PATH)/styles/compressed -t compressed" \
351+
--interactive $(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/styles/compressed
352+
$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
353+
--cmd-args "-I $(LIBSASS_SPEC_PATH)/styles/nested -t nested" \
354+
--interactive $(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/styles/nested
311355

312356
clean-objects: | lib
313357
-$(RM) lib/*.a lib/*.so lib/*.dll lib/*.dylib lib/*.la

‎script/bootstrap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,13 @@
22

33
script/branding
44

5+
: ${LIBSASS_SPEC_PATH:="libsass-spec"}
56
: ${SASS_SPEC_PATH:="sass-spec"}
67
: ${SASS_SASSC_PATH:="sassc" }
78

9+
if [ ! -d $LIBSASS_SPEC_PATH ]; then
10+
git clone https://github.com/mgreter/libsass-spec.git $LIBSASS_SPEC_PATH
11+
fi
812
if [ ! -d $SASS_SPEC_PATH ]; then
913
git clone https://github.com/sass/sass-spec.git $SASS_SPEC_PATH
1014
fi

0 commit comments

Comments
 (0)