From: Glenn Morris Date: Tue, 8 Jan 2008 08:03:25 +0000 (+0000) Subject: Kevin Ryde : X-Git-Tag: emacs-pretest-23.0.90~8645 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=01f179de33cfb99f8cb5761c2320ab1390a7bf1c;p=emacs.git Kevin Ryde : (compilation-error-regexp-alist-alist): Add entry for two-arg form of the Test module ok() func. --- 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 * 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 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)