Skip to content

Commit

Permalink
Fix failing integration tests
Browse files Browse the repository at this point in the history
  • Loading branch information
fmdkdd committed Dec 13, 2020
1 parent 79c9245 commit 98190b8
Show file tree
Hide file tree
Showing 8 changed files with 56 additions and 77 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Use Python 3.5 for our tooling
language: python
python:
- "3.5"
- "3.8"

# Our tests are run with Emacs in Docker
services:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ endif
# Public targets
.PHONY: init
init:
$(CASK) install
$(CASK) --verbose install # --verbose is workaround for Emacs 25.3
$(CASK) update

.PHONY: clean
Expand Down
16 changes: 11 additions & 5 deletions flycheck.el
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; flycheck.el --- On-the-fly syntax checking -*- lexical-binding: t; -*-

;; Copyright (C) 2017-2019 Flycheck contributors
;; Copyright (C) 2017-2020 Flycheck contributors
;; Copyright (C) 2012-2016 Sebastian Wiesner and Flycheck contributors
;; Copyright (C) 2013, 2014 Free Software Foundation, Inc.
;;
Expand Down Expand Up @@ -10811,7 +10811,7 @@ See URL `https://racket-lang.org/'."
(flycheck-define-checker rpm-rpmlint
"A RPM SPEC file syntax checker using rpmlint.

See URL `https://sourceforge.net/projects/rpmlint/'."
See URL `https://github.com/rpm-software-management/rpmlint'."
:command ("rpmlint" source)
:error-patterns
((error line-start
Expand All @@ -10821,9 +10821,13 @@ See URL `https://sourceforge.net/projects/rpmlint/'."
(file-name) ":" (optional line ":") " W: " (message)
line-end))
:error-filter
;; Add fake line numbers if they are missing in the lint output
;; rpmlint 1.1 outputs a spurious error for the temp file created by flycheck
(lambda (errors)
(dolist (err errors)
(dolist (err (seq-remove
(lambda (err)
(string-suffix-p "(none)" (flycheck-error-filename err)))
errors))
;; Add fake line numbers if they are missing in the lint output
(unless (flycheck-error-line err)
(setf (flycheck-error-line err) 1)))
errors)
Expand Down Expand Up @@ -11977,7 +11981,9 @@ See URL
:error-patterns
((error line-start (file-name) ":" (optional line ":") (message) line-end)
(error line-start "[" (file-name) ":" line "]" (message) line-end))
:error-filter flycheck-fill-empty-line-numbers
:error-filter (lambda (errors)
(flycheck-sanitize-errors
(flycheck-fill-empty-line-numbers errors)))
:modes (systemd-mode))

(flycheck-def-config-file-var flycheck-chktexrc tex-chktex ".chktexrc")
Expand Down
105 changes: 43 additions & 62 deletions test/flycheck-test.el

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion test/resources/checkers/go/src/multipkg/a.go

This file was deleted.

1 change: 0 additions & 1 deletion test/resources/checkers/go/src/multipkg/b.go

This file was deleted.

2 changes: 0 additions & 2 deletions test/resources/language/chicken/error.scm

This file was deleted.

4 changes: 0 additions & 4 deletions test/resources/language/chicken/io-type-warning.scm

This file was deleted.

0 comments on commit 98190b8

Please sign in to comment.