diff options
| author | Kevin Ryde <user42@zip.com.au> | 2011-07-03 23:39:49 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2011-07-03 23:39:49 +0200 |
| commit | 6cbbc20c42906f4751a63eb1b3c4556efd0ded61 (patch) | |
| tree | de849c0d55ea9e7e07caaa06c23df007eb7b880f /lisp | |
| parent | 61436e9f418dc7e769f5c59ed884d9188520cca8 (diff) | |
| download | emacs-6cbbc20c42906f4751a63eb1b3c4556efd0ded61.tar.gz | |
* progmodes/compile.el (compilation-error-regexp-alist-alist):
`perl-Test2' extend to match possible "fail #N" rep count
(bug#8377).
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/progmodes/compile.el | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 481000f8851..fa46ab7850e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2011-03-29 Kevin Ryde <user42@zip.com.au> + + * progmodes/compile.el (compilation-error-regexp-alist-alist): + `perl-Test2' extend to match possible "fail #N" rep count + (bug#8377). + 2011-07-03 Lars Magne Ingebrigtsen <larsi@gnus.org> * mail/feedmail.el (feedmail-buffer-to-smtpmail): diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 1a23cd112af..0b9390af6c9 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -400,15 +400,16 @@ File = \\(.+\\), Line = \\([0-9]+\\)\\(?:, Column = \\([0-9]+\\)\\)?" "^# Failed test [0-9]+ in \\([^ \t\r\n]+\\) at line \\([0-9]+\\)" 1 2) (perl--Test2 - ;; Or when comparing got/want values, + ;; Or when comparing got/want values, with a "fail #n" if repeated ;; # Test 2 got: "xx" (t-compilation-perl-2.t at line 10) + ;; # Test 3 got: "xx" (t-compilation-perl-2.t at line 10 fail #2) ;; ;; And under Test::Harness they're preceded by progress stuff with ;; \r and "NOK", ;; ... NOK 1# Test 1 got: "1234" (t/foo.t at line 46) ;; "^\\(.*NOK.*\\)?# Test [0-9]+ got:.* (\\([^ \t\r\n]+\\) at line \ -\\([0-9]+\\))" +\\([0-9]+\\)\\( fail #[0-9]+\\)?)" 2 3) (perl--Test::Harness ;; perl Test::Harness output, eg. |