procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tag some unstable tests, and skip by default (bug#24503)

Browse source 
* Makefile.in (check-all): New phony target.
* test/Makefile.in (SELECTOR_DEFAULT, SELECTOR_EXPENSIVE):
Also skip unstable tests.
(SELECTOR_ALL): New variable.
(check-all): New phony target.
* test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el
(eieio-test-method-order-list-6):
* test/lisp/emacs-lisp/eieio-tests/eieio-tests.el
(eieio-test-37-obsolete-name-in-constructor):
Mark as unstable rather than skipping on hydra.nixos.org.
This commit is contained in:
Glenn Morris 2018-01-09 19:59:04 -08:00
parent 7668717d6f
commit a9b884c60f
4 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Makefile.in
View file

@ -58,9 +58,11 @@
# make docs # make docs
# Make Emacs documentation files from their sources; requires makeinfo. # Make Emacs documentation files from their sources; requires makeinfo.
# #
# make check or make check-expensive # make check (or check-expensive or check-all)
# Run Emacs test suite. check-expensive runs also tests which # Run the Emacs test suite.
# take more time to perform. # check-expensive includes additional tests that can be slow.
# check-all runs all tests, including ones that can be slow, or
# fail unpredictably
SHELL = @SHELL@ SHELL = @SHELL@
@ -938,7 +940,8 @@ have-tests:
exit 1; \ exit 1; \
fi fi
check check-maybe check-expensive: have-tests all .PHONY: check check-maybe check-expensive check-all
check check-maybe check-expensive check-all: have-tests all
$(MAKE) -C test $@ $(MAKE) -C test $@
dist: dist:
@ -955,7 +958,7 @@ $(DOCS):
$(MAKE) -C doc/$(subst -, ,$@) $(MAKE) -C doc/$(subst -, ,$@)
.PHONY: $(DOCS) docs pdf ps .PHONY: $(DOCS) docs pdf ps
.PHONY: info dvi dist check check-maybe check-expensive html info-real info-dir check-info .PHONY: info dvi dist html info-real info-dir check-info
## TODO add etc/refcards. ## TODO add etc/refcards.
docs: $(DOCS) docs: $(DOCS)

10
test/Makefile.in
View file

@ -125,8 +125,9 @@ test_module_dir := $(srcdir)/data/emacs-module
all: check all: check
SELECTOR_DEFAULT = (quote (not (tag :expensive-test))) SELECTOR_DEFAULT = (quote (not (or (tag :expensive-test) (tag :unstable))))
SELECTOR_EXPENSIVE = nil SELECTOR_EXPENSIVE = (quote (not (tag :unstable)))
SELECTOR_ALL = nil
ifdef SELECTOR ifdef SELECTOR
SELECTOR_ACTUAL=$(SELECTOR) SELECTOR_ACTUAL=$(SELECTOR)
else ifndef MAKECMDGOALS else ifndef MAKECMDGOALS
@ -241,6 +242,11 @@ check: mostlyclean check-no-automated-subdir
check-expensive: mostlyclean check-no-automated-subdir check-expensive: mostlyclean check-no-automated-subdir
@${MAKE} check-doit SELECTOR="${SELECTOR_EXPENSIVE}" @${MAKE} check-doit SELECTOR="${SELECTOR_EXPENSIVE}"
## Run all tests, regardless of tag.
.PHONY: check-all
check-all: mostlyclean check-no-automated-subdir
@${MAKE} check-doit SELECTOR="${SELECTOR_ALL}"
## Re-run all tests which are outdated. A test is outdated if its ## Re-run all tests which are outdated. A test is outdated if its
## logfile is out-of-date with either the test file, or the source ## logfile is out-of-date with either the test file, or the source
## files that the tests depend on. See test_template. ## files that the tests depend on. See test_template.

2
test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el
View file

@ -192,7 +192,7 @@
(ert-deftest eieio-test-method-order-list-6 () (ert-deftest eieio-test-method-order-list-6 ()
;; FIXME repeated intermittent failures on hydra (bug#24503) ;; FIXME repeated intermittent failures on hydra (bug#24503)
;; ((:STATIC C) (:STATIC C-base1) (:STATIC C-base2)) != ((:STATIC C))") ;; ((:STATIC C) (:STATIC C-base1) (:STATIC C-base2)) != ((:STATIC C))")
(skip-unless (not (getenv "EMACS_HYDRA_CI"))) :tags '(:unstable)
(let ((eieio-test-method-order-list nil) (let ((eieio-test-method-order-list nil)
(ans '( (ans '(
(:STATIC C) (:STATIC C)

4
test/lisp/emacs-lisp/eieio-tests/eieio-tests.el
View file

@ -893,8 +893,8 @@ Subclasses to override slot attributes.")
(list newname 2)) (list newname 2))
(ert-deftest eieio-test-37-obsolete-name-in-constructor () (ert-deftest eieio-test-37-obsolete-name-in-constructor ()
;; FIXME repeated intermittent failures on hydra (bug#24503) ;; FIXME repeated intermittent failures on hydra and elsewhere (bug#24503).
(skip-unless (not (getenv "EMACS_HYDRA_CI"))) :tags '(:unstable)
(should (equal (eieio--testing "toto") '("toto" 2)))) (should (equal (eieio--testing "toto") '("toto" 2))))
(ert-deftest eieio-autoload () (ert-deftest eieio-autoload ()