Skip to content

Commit

Permalink
Merge pull request #3077 from mgreter/feature/libsass-spec-ci
Browse files Browse the repository at this point in the history 
Add new libsass spec repository to CI test
  • Loading branch information
@mgreter
mgreter authored Apr 11, 2020
2 parents 8f59b01 + 83c9e92 commit 9515008
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 4 deletions.
18 changes: 18 additions & 0 deletions GNUmakefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ if ENABLE_TESTS

SASS_SASSC_PATH ?= $(top_srcdir)/sassc
SASS_SPEC_PATH ?= $(top_srcdir)/sass-spec
LIBSASS_SPEC_PATH ?= $(top_srcdir)/libsass-spec

noinst_PROGRAMS = tester
tester_LDADD = src/libsass.la
Expand All @@ -49,24 +50,41 @@ AM_RB_LOG_FLAGS = $(RUBY)
SASS_TEST_FLAGS = --impl libsass
SASS_TEST_FLAGS += -r $(SASS_SPEC_PATH)/spec
SASS_TEST_FLAGS += -c $(top_srcdir)/tester$(EXEEXT)
LIBSASS_TEST_FLAGS = --impl libsass
LIBSASS_TEST_FLAGS += -r $(LIBSASS_SPEC_PATH)/spec
LIBSASS_TEST_FLAGS += -c $(top_srcdir)/tester$(EXEEXT)
COMPRESSED_TEST_FLAGS = --impl libsass
COMPRESSED_TEST_FLAGS += -r $(LIBSASS_SPEC_PATH)/styles/compressed
COMPRESSED_TEST_FLAGS += -c $(top_srcdir)/tester$(EXEEXT)
COMPRESSED_TEST_FLAGS += --cmd-args="-t compressed"
AM_TESTS_ENVIRONMENT = TEST_FLAGS='$(SASS_TEST_FLAGS)'

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

test:
$(SASS_TESTER) $(SASS_TEST_FLAGS)
$(SASS_TESTER) $(LIBSASS_TEST_FLAGS)
$(SASS_TESTER) $(COMPRESSED_TEST_FLAGS)

test_build:
$(SASS_TESTER) $(SASS_TEST_FLAGS)
$(SASS_TESTER) $(LIBSASS_TEST_FLAGS)
$(SASS_TESTER) $(COMPRESSED_TEST_FLAGS)

test_full:
$(SASS_TESTER) --run-todo $(SASS_TEST_FLAGS)
$(SASS_TESTER) --run-todo $(LIBSASS_TEST_FLAGS)
$(SASS_TESTER) --run-todo $(COMPRESSED_TEST_FLAGS)

test_probe:
$(SASS_TESTER) --probe-todo $(SASS_TEST_FLAGS)
$(SASS_TESTER) --probe-todo $(LIBSASS_TEST_FLAGS)
$(SASS_TESTER) --probe-todo $(COMPRESSED_TEST_FLAGS)

test_interactive:
$(SASS_TESTER) --interactive $(SASS_TEST_FLAGS)
$(SASS_TESTER) --interactive $(LIBSASS_TEST_FLAGS)
$(SASS_TESTER) --interactive $(COMPRESSED_TEST_FLAGS)

.PHONY: test test_build test_full test_probe

Expand Down
52 changes: 48 additions & 4 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,8 @@ endif
SASS_SASSC_PATH ?= sassc
SASS_SPEC_PATH ?= sass-spec
SASS_SPEC_SPEC_DIR ?= spec
LIBSASS_SPEC_PATH ?= libsass-spec
LIBSASS_SPEC_SPEC_DIR ?= spec
SASSC_BIN = $(SASS_SASSC_PATH)/bin/sassc
RUBY_BIN = ruby

Expand Down Expand Up @@ -289,25 +291,67 @@ version: $(SASSC_BIN)

test: test_build

test_build: $(SASSC_BIN)
$(SASS_SPEC_PATH):
git clone https://github.com/sass/sass-spec $(SASS_SPEC_PATH)

$(LIBSASS_SPEC_PATH):
git clone https://github.com/mgreter/libsass-spec $(LIBSASS_SPEC_PATH)

test_build: $(SASSC_BIN) $(SASS_SPEC_PATH) $(LIBSASS_SPEC_PATH)
$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
--cmd-args "-I $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)" \
$(LOG_FLAGS) $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)
$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
--cmd-args "-I $(LIBSASS_SPEC_PATH)/$(LIBSASS_SPEC_SPEC_DIR)" \
$(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/$(LIBSASS_SPEC_SPEC_DIR)
$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
--cmd-args "-I $(LIBSASS_SPEC_PATH)/styles/compressed -t compressed" \
$(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/styles/compressed
$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
--cmd-args "-I $(LIBSASS_SPEC_PATH)/styles/nested -t nested" \
$(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/styles/nested

test_full: $(SASSC_BIN)
test_full: $(SASSC_BIN) $(SASS_SPEC_PATH) $(LIBSASS_SPEC_PATH)
$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
--cmd-args "-I $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)" \
--run-todo $(LOG_FLAGS) $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)
$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
--cmd-args "-I $(LIBSASS_SPEC_PATH)/$(LIBSASS_SPEC_SPEC_DIR)" \
--run-todo $(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/$(LIBSASS_SPEC_SPEC_DIR)
$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
--cmd-args "-I $(LIBSASS_SPEC_PATH)/styles/compressed -t compressed" \
--run-todo $(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/styles/compressed
$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
--cmd-args "-I $(LIBSASS_SPEC_PATH)/styles/nested -t nested" \
--run-todo $(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/styles/nested

test_probe: $(SASSC_BIN)
test_probe: $(SASSC_BIN) $(SASS_SPEC_PATH) $(LIBSASS_SPEC_PATH)
$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
--cmd-args "-I $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)" \
--probe-todo $(LOG_FLAGS) $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)
$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
--cmd-args "-I $(LIBSASS_SPEC_PATH)/$(LIBSASS_SPEC_SPEC_DIR)" \
--probe-todo $(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/$(LIBSASS_SPEC_SPEC_DIR)
$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
--cmd-args "-I $(LIBSASS_SPEC_PATH)/styles/compressed -t compressed" \
--probe-todo $(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/styles/compressed
$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
--cmd-args "-I $(LIBSASS_SPEC_PATH)/styles/nested -t nested" \
--probe-todo $(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/styles/nested

test_interactive: $(SASSC_BIN)
test_interactive: $(SASSC_BIN) $(SASS_SPEC_PATH) $(LIBSASS_SPEC_PATH)
$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
--cmd-args "-I $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)" \
--interactive $(LOG_FLAGS) $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR)
$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
--cmd-args "-I $(LIBSASS_SPEC_PATH)/$(LIBSASS_SPEC_SPEC_DIR)" \
--interactive $(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/$(LIBSASS_SPEC_SPEC_DIR)
$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
--cmd-args "-I $(LIBSASS_SPEC_PATH)/styles/compressed -t compressed" \
--interactive $(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/styles/compressed
$(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -c $(SASSC_BIN) --impl libsass \
--cmd-args "-I $(LIBSASS_SPEC_PATH)/styles/nested -t nested" \
--interactive $(LOG_FLAGS) $(LIBSASS_SPEC_PATH)/styles/nested

clean-objects: | lib
-$(RM) lib/*.a lib/*.so lib/*.dll lib/*.dylib lib/*.la
Expand Down
4 changes: 4 additions & 0 deletions script/bootstrap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@

script/branding

: ${LIBSASS_SPEC_PATH:="libsass-spec"}
: ${SASS_SPEC_PATH:="sass-spec"}
: ${SASS_SASSC_PATH:="sassc" }

if [ ! -d $LIBSASS_SPEC_PATH ]; then
git clone https://github.com/mgreter/libsass-spec.git $LIBSASS_SPEC_PATH
fi
if [ ! -d $SASS_SPEC_PATH ]; then
git clone https://github.com/sass/sass-spec.git $SASS_SPEC_PATH
fi
Expand Down

0 comments on commit 9515008

Please sign in to comment.