From 26084e38d017ed22cd6539dde023aa20e5e35217 Mon Sep 17 00:00:00 2001 From: Marcel Greter Date: Sat, 23 Apr 2016 01:07:46 +0200 Subject: [PATCH] Enable probing for passing todo specs in CI => https://github.com/sass/sass-spec/pull/836 --- GNUmakefile.am | 4 ++-- Makefile | 11 +++++++---- appveyor.yml | 2 +- script/ci-build-libsass | 6 +++--- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/GNUmakefile.am b/GNUmakefile.am index b321d38529..d2bfdbfec4 100644 --- a/GNUmakefile.am +++ b/GNUmakefile.am @@ -80,8 +80,8 @@ test_build: test_full: $(SASS_TESTER) --run-todo $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS) -test_issues: - $(SASS_TESTER) --run-todo $(LOG_FLAGS) $(SASS_SPEC_PATH)/spec/issues $(SASS_TEST_FLAGS) +test_probe: + $(SASS_TESTER) --probe-todo $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS) endif diff --git a/Makefile b/Makefile index 579c4f16a3..85f5eb307b 100644 --- a/Makefile +++ b/Makefile @@ -300,13 +300,16 @@ version: $(SASSC_BIN) $(SASSC_BIN) -v test: $(SASSC_BIN) - $(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -V 3.4 -c $(SASSC_BIN) --impl libsass -s --run-todo $(LOG_FLAGS) $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR) + $(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -V 3.4 -c $(SASSC_BIN) --impl libsass $(LOG_FLAGS) $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR) test_build: $(SASSC_BIN) - $(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -V 3.4 -c $(SASSC_BIN) --impl libsass -s $(LOG_FLAGS) $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR) + $(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -V 3.4 -c $(SASSC_BIN) --impl libsass $(LOG_FLAGS) $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR) -test_issues: $(SASSC_BIN) - $(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -V 3.4 -c $(SASSC_BIN) --impl libsass --run-todo $(LOG_FLAGS) $(SASS_SPEC_PATH)/spec/issues +test_full: $(SASSC_BIN) + $(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -V 3.4 -c $(SASSC_BIN) --impl libsass --run-todo $(LOG_FLAGS) $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR) + +test_probe: $(SASSC_BIN) + $(RUBY_BIN) $(SASS_SPEC_PATH)/sass-spec.rb -V 3.4 -c $(SASSC_BIN) --impl libsass --probe-todo $(LOG_FLAGS) $(SASS_SPEC_PATH)/$(SASS_SPEC_SPEC_DIR) clean-objects: lib -$(RM) lib/*.a lib/*.so lib/*.dll lib/*.la diff --git a/appveyor.yml b/appveyor.yml index f14f766fab..c4931e031e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -63,7 +63,7 @@ test_script: git -C sass-spec checkout -q --force ci-spec-pr-$SPEC_PR } } - ruby sass-spec/sass-spec.rb -V 3.4 --impl libsass -c $env:TargetPath -s sass-spec/spec + ruby sass-spec/sass-spec.rb -V 3.4 --probe-todo --impl libsass -c $env:TargetPath -s sass-spec/spec if(-not($?)) { echo "sass-spec tests failed" exit 1 diff --git a/script/ci-build-libsass b/script/ci-build-libsass index ac56b1fe2c..e2e5b2d2cf 100755 --- a/script/ci-build-libsass +++ b/script/ci-build-libsass @@ -120,10 +120,10 @@ then echo "Fetching Sass Spec PR $SPEC_PR" git -C sass-spec fetch -u origin pull/$SPEC_PR/head:ci-spec-pr-$SPEC_PR git -C sass-spec checkout --force ci-spec-pr-$SPEC_PR - LD_LIBRARY_PATH="$PREFIX/lib/" make $MAKE_OPTS test_build + LD_LIBRARY_PATH="$PREFIX/lib/" make $MAKE_OPTS test_probe else - LD_LIBRARY_PATH="$PREFIX/lib/" make $MAKE_OPTS test_build + LD_LIBRARY_PATH="$PREFIX/lib/" make $MAKE_OPTS test_probe fi else - LD_LIBRARY_PATH="$PREFIX/lib/" make $MAKE_OPTS test_build + LD_LIBRARY_PATH="$PREFIX/lib/" make $MAKE_OPTS test_probe fi