Skip to content

Commit 57fbfb9

Browse files
committed
Merge pull request #2035 from mgreter/feature/probe-passing-todo
Enable probing for passing todo specs in CI
2 parents cbf5c31 + 26084e3 commit 57fbfb9

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

GNUmakefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ test_build:
8080
test_full:
8181
$(SASS_TESTER) --run-todo $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS)
8282

83-
test_issues:
84-
$(SASS_TESTER) --run-todo $(LOG_FLAGS) $(SASS_SPEC_PATH)/spec/issues $(SASS_TEST_FLAGS)
83+
test_probe:
84+
$(SASS_TESTER) --probe-todo $(LOG_FLAGS) $(SASS_SPEC_PATH) $(SASS_TEST_FLAGS)
8585

8686
endif
8787

Makefile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -300,13 +300,16 @@ version: $(SASSC_BIN)
300300
$(SASSC_BIN) -v
301301

302302
test: $(SASSC_BIN)
303-
$(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)
303+
$(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)
304304

305305
test_build: $(SASSC_BIN)
306-
$(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)
306+
$(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)
307307

308-
test_issues: $(SASSC_BIN)
309-
$(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
308+
test_full: $(SASSC_BIN)
309+
$(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)
310+
311+
test_probe: $(SASSC_BIN)
312+
$(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)
310313

311314
clean-objects: lib
312315
-$(RM) lib/*.a lib/*.so lib/*.dll lib/*.la

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ test_script:
6363
git -C sass-spec checkout -q --force ci-spec-pr-$SPEC_PR
6464
}
6565
}
66-
ruby sass-spec/sass-spec.rb -V 3.4 --impl libsass -c $env:TargetPath -s sass-spec/spec
66+
ruby sass-spec/sass-spec.rb -V 3.4 --probe-todo --impl libsass -c $env:TargetPath -s sass-spec/spec
6767
if(-not($?)) {
6868
echo "sass-spec tests failed"
6969
exit 1

script/ci-build-libsass

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,10 @@ then
120120
echo "Fetching Sass Spec PR $SPEC_PR"
121121
git -C sass-spec fetch -u origin pull/$SPEC_PR/head:ci-spec-pr-$SPEC_PR
122122
git -C sass-spec checkout --force ci-spec-pr-$SPEC_PR
123-
LD_LIBRARY_PATH="$PREFIX/lib/" make $MAKE_OPTS test_build
123+
LD_LIBRARY_PATH="$PREFIX/lib/" make $MAKE_OPTS test_probe
124124
else
125-
LD_LIBRARY_PATH="$PREFIX/lib/" make $MAKE_OPTS test_build
125+
LD_LIBRARY_PATH="$PREFIX/lib/" make $MAKE_OPTS test_probe
126126
fi
127127
else
128-
LD_LIBRARY_PATH="$PREFIX/lib/" make $MAKE_OPTS test_build
128+
LD_LIBRARY_PATH="$PREFIX/lib/" make $MAKE_OPTS test_probe
129129
fi

0 commit comments

Comments
 (0)