mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-24 10:38:38 +00:00
Code Issues Releases Activity

Use a more specific test for running on hydra.nixos.org

Browse Source 
* lisp/emacs-lisp/ert.el (ert-summarize-tests-batch-and-exit):
* test/Makefile.in (WRITE_LOG):
* test/lisp/filenotify-tests.el:
* 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):
* test/lisp/net/tramp-tests.el: Replace NIX_STORE with EMACS_HYDRA_CI.
This commit is contained in:
Glenn Morris 2017-07-18 12:53:46 -04:00
parent c204948909
commit 5ab91020fb
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/emacs-lisp/ert.el
View File

@ -1512,7 +1512,7 @@ Ran \\([0-9]+\\) tests, \\([0-9]+\\) results as expected\
(message "%d files contained unexpected results:" (length unexpected))
(mapc (lambda (l) (message " %s" l)) unexpected))
;; More details on hydra, where the logs are harder to get to.
(when (and (getenv "NIX_STORE")
(when (and (getenv "EMACS_HYDRA_CI")
(not (zerop (+ nunexpected nskipped))))
(message "\nDETAILS")
(message "-------")

2
test/Makefile.in
View File

@ -136,7 +136,7 @@ endif
$(AM_V_ELC)$(emacs) -f batch-byte-compile $<
## Save logs, and show logs for failed tests.
WRITE_LOG = $(if $(and ${NIX_STORE}, $(findstring tramp, $@)), |& tee $@, > $@ 2>&1) \
WRITE_LOG = $(if $(and ${EMACS_HYDRA_CI}, $(findstring tramp, $@)), |& tee $@, > $@ 2>&1) \
|| { STAT=$$?; cat $@; exit $$STAT; }
ifeq ($(TEST_LOAD_EL), yes)

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 ()
;; FIXME repeated intermittent failures on hydra (bug#24503)
;; ((:STATIC C) (:STATIC C-base1) (:STATIC C-base2)) != ((:STATIC C))")
(skip-unless (not (getenv "NIX_STORE")))
(skip-unless (not (getenv "EMACS_HYDRA_CI")))
(let ((eieio-test-method-order-list nil)
(ans '(
(:STATIC C)

2
test/lisp/emacs-lisp/eieio-tests/eieio-tests.el
View File

@ -894,7 +894,7 @@ Subclasses to override slot attributes.")
(ert-deftest eieio-test-37-obsolete-name-in-constructor ()
;; FIXME repeated intermittent failures on hydra (bug#24503)
(skip-unless (not (getenv "NIX_STORE")))
(skip-unless (not (getenv "EMACS_HYDRA_CI")))
(should (equal (eieio--testing "toto") '("toto" 2))))
(ert-deftest eieio-autoload ()

4
test/lisp/filenotify-tests.el
View File

@ -173,8 +173,8 @@ Return nil when any other file notification watch is still active."
tramp-verbose 0
tramp-message-show-message nil)
;; This shall happen on hydra only.
(when (getenv "NIX_STORE")
;; This should happen on hydra only.
(when (getenv "EMACS_HYDRA_CI")
(add-to-list 'tramp-remote-path 'tramp-own-remote-path))
;; We do not want to try and fail `file-notify-add-watch'.

6
test/lisp/net/tramp-tests.el
View File

@ -86,8 +86,8 @@
tramp-message-show-message nil
tramp-persistency-file-name nil)
;; This shall happen on hydra only.
(when (getenv "NIX_STORE")
;; This should happen on hydra only.
(when (getenv "EMACS_HYDRA_CI")
(add-to-list 'tramp-remote-path 'tramp-own-remote-path))
(defvar tramp--test-expensive-test
@ -3706,7 +3706,7 @@ process sentinels. They shall not disturb each other."
;; On hydra, timings are bad.
(timer-repeat
(cond
((getenv "NIX_STORE") 10)
((getenv "EMACS_HYDRA_CI") 10)
(t 1)))
;; We must distinguish due to performance reasons.
(timer-operation