diff options
Diffstat (limited to 'test/lisp/progmodes/flymake-tests.el')
| -rw-r--r-- | test/lisp/progmodes/flymake-tests.el | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/test/lisp/progmodes/flymake-tests.el b/test/lisp/progmodes/flymake-tests.el index f5aa5d76a1e..77929d395f5 100644 --- a/test/lisp/progmodes/flymake-tests.el +++ b/test/lisp/progmodes/flymake-tests.el @@ -53,7 +53,7 @@ while notdone unless noninteractive do (read-event "" nil 0.1) do (sleep-for (+ 0.5 flymake-no-changes-timeout)) - finally (when notdone (ert-fail + finally (when notdone (ert-skip (format "Some backends not reporting yet %s" notdone))))) @@ -111,6 +111,7 @@ SEVERITY-PREDICATE is used to setup (ert-deftest perl-backend () "Test the perl backend" (skip-unless (executable-find "perl")) + (skip-unless (not (getenv "EMACS_HYDRA_CI"))) (flymake-tests--with-flymake ("test.pl") (flymake-goto-next-error) (should (eq 'flymake-warning (face-at-point))) @@ -118,9 +119,11 @@ SEVERITY-PREDICATE is used to setup (flymake-goto-prev-error) (should (eq 'flymake-error (face-at-point))))) +(defvar ruby-mode-hook) (ert-deftest ruby-backend () "Test the ruby backend" (skip-unless (executable-find "ruby")) + (skip-unless (not (getenv "EMACS_HYDRA_CI"))) ;; Some versions of ruby fail if HOME doesn't exist (bug#29187). (let* ((tempdir (make-temp-file "flymake-tests-ruby" t)) (process-environment (cons (format "HOME=%s" tempdir) @@ -129,15 +132,21 @@ SEVERITY-PREDICATE is used to setup ;; for this particular yuckiness (abbreviated-home-dir nil)) (unwind-protect - (flymake-tests--with-flymake ("test.rb") - (flymake-goto-next-error) - (should (eq 'flymake-warning (face-at-point))) - (flymake-goto-next-error) - (should (eq 'flymake-error (face-at-point)))) + (let ((ruby-mode-hook + (lambda () + (setq flymake-diagnostic-functions '(ruby-flymake-simple))))) + (flymake-tests--with-flymake ("test.rb") + (flymake-goto-next-error) + (should (eq 'flymake-warning (face-at-point))) + (flymake-goto-next-error) + (should (eq 'flymake-error (face-at-point))))) (delete-directory tempdir t)))) (ert-deftest different-diagnostic-types () "Test GCC warning via function predicate." + ;; http://lists.gnu.org/archive/html/emacs-devel/2019-03/msg01043.html + :expected-result (if (or (getenv "EMACS_HYDRA_CI") (getenv "EMACS_EMBA_CI")) + :failed :passed) (skip-unless (and (executable-find "gcc") (version<= "5" (string-trim @@ -163,6 +172,7 @@ SEVERITY-PREDICATE is used to setup (ert-deftest included-c-header-files () "Test inclusion of .h header files." (skip-unless (and (executable-find "gcc") (executable-find "make"))) + (skip-unless (not (getenv "EMACS_HYDRA_CI"))) (let ((flymake-wrap-around nil)) (flymake-tests--with-flymake ("some-problems.h") @@ -288,6 +298,7 @@ SEVERITY-PREDICATE is used to setup (ert-deftest recurrent-backend () "Test a backend that calls REPORT-FN multiple times" + (skip-unless (not (getenv "EMACS_HYDRA_CI"))) (with-temp-buffer (let (tick) (cl-letf |