diff options
| author | Glenn Morris <rgm@gnu.org> | 2008-01-08 08:03:25 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2008-01-08 08:03:25 +0000 |
| commit | 01f179de33cfb99f8cb5761c2320ab1390a7bf1c (patch) | |
| tree | 195022333b0fb012616544384a94a0bc84439ccf /lisp | |
| parent | 10a1257e79b293e6f50be464051a14de641ebebc (diff) | |
| download | emacs-01f179de33cfb99f8cb5761c2320ab1390a7bf1c.tar.gz emacs-01f179de33cfb99f8cb5761c2320ab1390a7bf1c.tar.bz2 emacs-01f179de33cfb99f8cb5761c2320ab1390a7bf1c.zip | |
Kevin Ryde <user42 at zip.com.au>:
(compilation-error-regexp-alist-alist): Add entry for two-arg form of
the Test module ok() func.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/progmodes/compile.el | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a31a97d3ced..e0ed590c6fa 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,8 @@ 2008-01-08 Kevin Ryde <user42@zip.com.au> * progmodes/compile.el (compilation-error-regexp-alist-alist): - For perl, allow "during global destruction" at end. + For perl, allow "during global destruction" at end. Add entry for + two-arg form of the Test module ok() func. 2008-01-08 Glenn Morris <rgm@gnu.org> diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 444d3b44e5d..772d35f94f0 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -370,6 +370,17 @@ File = \\(.+\\), Line = \\([0-9]+\\)\\(?:, Column = \\([0-9]+\\)\\)?" ;; "^# Failed test [0-9]+ in \\([^ \t\r\n]+\\) at line \\([0-9]+\\)" 1 2) + (compilation-perl--Test2 + ;; Or when comparing got/want values, + ;; # Test 2 got: "xx" (t-compilation-perl-2.t at line 10) + ;; + ;; 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]+\\))" + 2 3) (compilation-perl--Test::Harness ;; perl Test::Harness output, eg. ;; NOK 1# Test 1 got: "1234" (t/foo.t at line 46) |