4 files changed, 38 insertions, 20 deletions

diff --git a/test/Makefile.in b/test/Makefile.in
index e8b14319549..9f7011353cf 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -87,9 +87,15 @@ WRITE_LOG = > $@ 2>&1 || { stat=ERROR; cat $@; }; echo $$stat: $@
 ## to change this; bug#17848 - if that gets done, this can be simplified).
 ##
 ## Beware: it approximates 'no-byte-compile', so watch out for false-positives!
-SELECTOR_DEFAULT=(quote (not (tag :expensive-test)))
-SELECTOR_EXPENSIVE=nil
-SELECTOR=
+SELECTOR_DEFAULT = (quote (not (tag :expensive-test)))
+SELECTOR_EXPENSIVE = nil
+ifndef SELECTOR
+SELECTOR_ACTUAL=$(SELECTOR_DEFAULT)
+else
+SELECTOR_ACTUAL=$(SELECTOR)
+endif
+
+
 %.log: %.el
         @if grep '^;.*no-byte-compile: t' $< > /dev/null; then \
           loadfile=$<; \
@@ -101,7 +107,7 @@ SELECTOR=
         stat=OK ; \
         mkdir --parents $(dir $@) ; \
         $(emacs) -l ert -l $$loadfile \
-          --eval "(ert-run-tests-batch-and-exit ${SELECTOR})" ${WRITE_LOG}
+          --eval "(ert-run-tests-batch-and-exit ${SELECTOR_ACTUAL})" ${WRITE_LOG}
 
 ELFILES = $(shell find ${srcdir} -path "${srcdir}/manual" -prune -o \
                 -path "*resources" -prune -o -name "*el" -print)
@@ -136,29 +142,31 @@ $(foreach test,${TESTS},$(eval $(call test_template,${test})))
 ## have to run Emacs for every make invocation, and it might not be
 ## available during clean.
 -include make-test-deps.mk
-## Rerun default tests.
-check:
-        @${MAKE} check-doit SELECTOR="${SELECTOR_DEFAULT}"
+## Rerun all default tests.
+check: mostlyclean
+        @${MAKE} check-doit SELECTOR="${SELECTOR_ACTUAL}"
 
-## Rerun also expensive tests.
+## Rerun all default and expensive tests.
 .PHONY: check-expensive
-check-expensive:
+check-expensive: mostlyclean
         @${MAKE} check-doit SELECTOR="${SELECTOR_EXPENSIVE}"
 
-## Re-run all the tests every time.
-.PHONY: check-doit
-check-doit:
-        -@for f in $(LOGFILES); do test ! -f $$f || mv $$f $$f~; done
-        @${MAKE} check-maybe
-
-## Only re-run tests whose .log is older than the test.
+## Only re-run default tests whose .log is older than the test.
 .PHONY: check-maybe
-check-maybe: ${LOGFILES}
+check-maybe:
+        @${MAKE} check-doit SELECTOR="${SELECTOR_ACTUAL}"
+
+## Run the tests.
+.PHONY: check-doit
+check-doit: ${LOGFILES}
         $(emacs) -l ert -f ert-summarize-tests-batch-and-exit $^
 
 .PHONY: mostlyclean clean bootstrap-clean distclean maintainer-clean
 
-clean mostlyclean:
+mostlyclean:
+        -@for f in *.log; do test ! -f $$f || mv $$f $$f~; done
+
+clean:
         -rm -f ${LOGFILES} ${LOGSAVEFILES}
         -rm make-test-deps.mk
 
diff --git a/test/lisp/legacy/core-elisp-tests.el b/test/lisp/legacy/core-elisp-tests.el
index 76985331566..b44bb37cc4f 100644
--- a/test/lisp/legacy/core-elisp-tests.el
+++ b/test/lisp/legacy/core-elisp-tests.el
@@ -32,7 +32,7 @@
     (should (equal (list (let ((c-e-x 1)) (defvar c-e-x 2) c-e-x) c-e-x)
                    '(1 2)))
     (should (equal (list (let ((c-e-x 1))
-                           (defcustom c-e-x 2 "doc" :group 'blah) c-e-x)
+                           (defcustom c-e-x 2 "doc" :group 'blah :type 'integer) c-e-x)
                          c-e-x)
                    '(1 2)))))
 
diff --git a/test/manual/etags/html-src/softwarelibero.html b/test/manual/etags/html-src/softwarelibero.html
index 159432908d2..b374273c969 100644
--- a/test/manual/etags/html-src/softwarelibero.html
+++ b/test/manual/etags/html-src/softwarelibero.html
@@ -302,7 +302,7 @@
 Local variables:
 fill-column: 72
 time-stamp-active: t
-time-stamp-time-zone: "GMT"
+time-stamp-time-zone: "UTC0"
 time-stamp-format: "%:y-%02m-%02d"
 time-stamp-line-limit: 30
 time-stamp-start: "ultima\\s-+modifica\\s-+è\\s-+del\\s-+"
diff --git a/test/manual/indent/scss-mode.scss b/test/manual/indent/scss-mode.scss
index 7a29929efca..02a4a98a8c5 100644
--- a/test/manual/indent/scss-mode.scss
+++ b/test/manual/indent/scss-mode.scss
@@ -55,3 +55,13 @@ article[role="main"] {
 }
 
 .box { @include border-radius(10px); }
+
+// bug:21230
+$list: (
+   ('a', #000000, #fff)
+   ('b', #000000, #fff)
+   ('c', #000000, #fff)
+   ('d', #000000, #fff)
+   ('e', #000000, #fff)
+   ('f', #000000, #fff)
+);