aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoão Távora2017-10-20 11:25:34 +0100
committerJoão Távora2017-10-20 11:28:07 +0100
commitd815de017bb531fed751ee0515ed90b73d7a9936 (patch)
tree1cfb100a902437550fd52b8d2edef54196468e9e
parentfd3d8610b27e26107ba15070aba0d488152f8f4d (diff)
downloademacs-d815de017bb531fed751ee0515ed90b73d7a9936.tar.gz
emacs-d815de017bb531fed751ee0515ed90b73d7a9936.zip
Skip a Flymake test for old gcc versions
Fixes: 28906 * test/lisp/progmodes/flymake-tests.el (different-diagnostic-types): Skip this test for gcc versions < 5.
-rw-r--r--test/lisp/progmodes/flymake-tests.el7
1 files changed, 6 insertions, 1 deletions
diff --git a/test/lisp/progmodes/flymake-tests.el b/test/lisp/progmodes/flymake-tests.el
index 9f570adcc41..eddd964ad14 100644
--- a/test/lisp/progmodes/flymake-tests.el
+++ b/test/lisp/progmodes/flymake-tests.el
@@ -24,6 +24,7 @@
24;;; Code: 24;;; Code:
25(require 'ert) 25(require 'ert)
26(require 'flymake) 26(require 'flymake)
27(require 'subr-x) ; string-trim
27 28
28(defvar flymake-tests-data-directory 29(defvar flymake-tests-data-directory
29 (expand-file-name "lisp/progmodes/flymake-resources" 30 (expand-file-name "lisp/progmodes/flymake-resources"
@@ -128,7 +129,11 @@ SEVERITY-PREDICATE is used to setup
128 129
129(ert-deftest different-diagnostic-types () 130(ert-deftest different-diagnostic-types ()
130 "Test GCC warning via function predicate." 131 "Test GCC warning via function predicate."
131 (skip-unless (and (executable-find "gcc") (executable-find "make"))) 132 (skip-unless (and (executable-find "gcc")
133 (version<=
134 "5" (string-trim
135 (shell-command-to-string "gcc -dumpversion")))
136 (executable-find "make")))
132 (let ((flymake-wrap-around nil)) 137 (let ((flymake-wrap-around nil))
133 (flymake-tests--with-flymake 138 (flymake-tests--with-flymake
134 ("errors-and-warnings.c") 139 ("errors-and-warnings.c")