[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 0d26e45 11/39: Add a new Flymake test for multipl
From: |
João Távora |
Subject: |
[Emacs-diffs] emacs-26 0d26e45 11/39: Add a new Flymake test for multiple errors and warnings |
Date: |
Tue, 3 Oct 2017 10:04:47 -0400 (EDT) |
branch: emacs-26
commit 0d26e45ab47d781e561bb415e28aab8cb166ced2
Author: João Távora <address@hidden>
Commit: João Távora <address@hidden>
Add a new Flymake test for multiple errors and warnings
* test/lisp/progmodes/flymake-tests.el
(flymake-tests--call-with-fixture): Save excursion.
(errors-and-warnings): New test.
* test/lisp/progmodes/flymake-resources/errors-and-warnings.c:
New test fixture.
---
.../flymake-resources/errors-and-warnings.c | 10 +++++
test/lisp/progmodes/flymake-tests.el | 48 ++++++++++++++--------
2 files changed, 42 insertions(+), 16 deletions(-)
diff --git a/test/lisp/progmodes/flymake-resources/errors-and-warnings.c
b/test/lisp/progmodes/flymake-resources/errors-and-warnings.c
new file mode 100644
index 0000000..6454dd2
--- /dev/null
+++ b/test/lisp/progmodes/flymake-resources/errors-and-warnings.c
@@ -0,0 +1,10 @@
+ int main()
+{
+ char c = 1000;
+ int bla;
+ /* The following line should have one warning and one error. The
+ warning spans the full line because gcc (at least 6.3.0) points
+ places the error at the =, which isn't a sexp.*/
+ char c; if (bla == (void*)3);
+ return c;
+}
diff --git a/test/lisp/progmodes/flymake-tests.el
b/test/lisp/progmodes/flymake-tests.el
index c626aec..5e76f31 100644
--- a/test/lisp/progmodes/flymake-tests.el
+++ b/test/lisp/progmodes/flymake-tests.el
@@ -49,23 +49,24 @@ SEVERITY-PREDICATE is used to setup
(i 0))
(unwind-protect
(with-current-buffer buffer
- (when sev-pred-supplied-p
- (setq-local flymake-proc-warning-predicate severity-predicate))
- (goto-char (point-min))
- (flymake-mode 1)
- ;; Weirdness here... http://debbugs.gnu.org/17647#25
- ;; ... meaning `sleep-for', and even
- ;; `accept-process-output', won't suffice as ways to get
- ;; process filters and sentinels to run, though they do work
- ;; fine in a non-interactive batch session. The only thing
- ;; that will indeed unblock pending process output is
- ;; reading an input event, so, as a workaround, use a dummy
- ;; `read-event' with a very short timeout.
- (unless noninteractive (read-event "" nil 0.1))
- (while (and flymake-is-running (< (setq i (1+ i)) 10))
+ (save-excursion
+ (when sev-pred-supplied-p
+ (setq-local flymake-proc-warning-predicate severity-predicate))
+ (goto-char (point-min))
+ (flymake-mode 1)
+ ;; Weirdness here... http://debbugs.gnu.org/17647#25
+ ;; ... meaning `sleep-for', and even
+ ;; `accept-process-output', won't suffice as ways to get
+ ;; process filters and sentinels to run, though they do work
+ ;; fine in a non-interactive batch session. The only thing
+ ;; that will indeed unblock pending process output is
+ ;; reading an input event, so, as a workaround, use a dummy
+ ;; `read-event' with a very short timeout.
(unless noninteractive (read-event "" nil 0.1))
- (sleep-for (+ 0.5 flymake-no-changes-timeout)))
- (funcall fn))
+ (while (and flymake-is-running (< (setq i (1+ i)) 10))
+ (unless noninteractive (read-event "" nil 0.1))
+ (sleep-for (+ 0.5 flymake-no-changes-timeout)))
+ (funcall fn)))
(and buffer
(not visiting)
(let (kill-buffer-query-functions) (kill-buffer buffer))))))
@@ -114,6 +115,21 @@ SEVERITY-PREDICATE is used to setup
(should (eq 'flymake-warning
(face-at-point)))))
+(ert-deftest errors-and-warnings ()
+ "Test GCC warning via function predicate."
+ (skip-unless (and (executable-find "gcc") (executable-find "make")))
+ (flymake-tests--with-flymake
+ ("errors-and-warnings.c")
+ (flymake-goto-next-error)
+ (should (eq 'flymake-error (face-at-point)))
+ (flymake-goto-next-error)
+ (should (eq 'flymake-warning (face-at-point)))
+ (flymake-goto-next-error)
+ (should (eq 'flymake-warning (face-at-point)))
+ (flymake-goto-next-error)
+ (should (eq 'flymake-error (face-at-point)))
+ (should-error (flymake-goto-next-error nil t)) ))
+
(provide 'flymake-tests)
;;; flymake.el ends here
- [Emacs-diffs] emacs-26 updated (0fff900 -> ca08b69), João Távora, 2017/10/03
- [Emacs-diffs] emacs-26 bbcb079 06/39: Allow running Flymake tests from interactive sessions, João Távora, 2017/10/03
- [Emacs-diffs] emacs-26 1c30f9f 05/39: Flymake diagnostics now apply to arbitrary buffer regions, João Távora, 2017/10/03
- [Emacs-diffs] emacs-26 8c85ab0 12/39: Echo Flymake error messages when navigating errors interactively, João Távora, 2017/10/03
- [Emacs-diffs] emacs-26 0d26e45 11/39: Add a new Flymake test for multiple errors and warnings,
João Távora <=
- [Emacs-diffs] emacs-26 54beebb 14/39: Flymake highlights GCC info/notes as detected by flymake-proc.el, João Távora, 2017/10/03
- [Emacs-diffs] emacs-26 f1601be 02/39: Flymake provides flymake-report re-entry point for backends, João Távora, 2017/10/03
- [Emacs-diffs] emacs-26 ae64bf1 08/39: New Flymake variable flymake-diagnostic-types-alist and much cleanup, João Távora, 2017/10/03
- [Emacs-diffs] emacs-26 6954270 03/39: Completely rewrite Flymake's subprocess output processing, João Távora, 2017/10/03
- [Emacs-diffs] emacs-26 f930963 18/39: Simplify Flymake logging and erroring, João Távora, 2017/10/03
- [Emacs-diffs] emacs-26 734aa88 09/39: Flymake's flymake-proc.el parses column numbers from gcc/javac errors, João Távora, 2017/10/03
- [Emacs-diffs] emacs-26 9f8ad13 07/39: Refactor Flymake tests in preparation for more tests, João Távora, 2017/10/03
- [Emacs-diffs] emacs-26 491cc4a 13/39: Flymake checks file names before considering diagnostics, João Távora, 2017/10/03
- [Emacs-diffs] emacs-26 7787988 10/39: Flymake warning face easier to distinguish, João Távora, 2017/10/03
- [Emacs-diffs] emacs-26 5ec7d73 19/39: Flymake's flymake-proc.el backend slightly easier to debug, João Távora, 2017/10/03