From: João Távora <joaotavora@gmail.com>
Date: Fri, 20 Oct 2017 10:25:34 +0000 (+0100)
Subject: Skip a Flymake test for old gcc versions
X-Git-Tag: emacs-26.0.91~514
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d815de017bb531fed751ee0515ed90b73d7a9936;p=emacs.git

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.
---

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 @@
 ;;; Code:
 (require 'ert)
 (require 'flymake)
+(require 'subr-x) ; string-trim
 
 (defvar flymake-tests-data-directory
   (expand-file-name "lisp/progmodes/flymake-resources"
@@ -128,7 +129,11 @@ SEVERITY-PREDICATE is used to setup
 
 (ert-deftest different-diagnostic-types ()
   "Test GCC warning via function predicate."
-  (skip-unless (and (executable-find "gcc") (executable-find "make")))
+  (skip-unless (and (executable-find "gcc")
+                    (version<=
+                     "5" (string-trim
+                          (shell-command-to-string "gcc -dumpversion")))
+                    (executable-find "make")))
   (let ((flymake-wrap-around nil))
     (flymake-tests--with-flymake
         ("errors-and-warnings.c")