aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris2008-01-08 08:03:25 +0000
committerGlenn Morris2008-01-08 08:03:25 +0000
commit01f179de33cfb99f8cb5761c2320ab1390a7bf1c (patch)
tree195022333b0fb012616544384a94a0bc84439ccf /lisp
parent10a1257e79b293e6f50be464051a14de641ebebc (diff)
downloademacs-01f179de33cfb99f8cb5761c2320ab1390a7bf1c.tar.gz
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/ChangeLog3
-rw-r--r--lisp/progmodes/compile.el11
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 @@
12008-01-08 Kevin Ryde <user42@zip.com.au> 12008-01-08 Kevin Ryde <user42@zip.com.au>
2 2
3 * progmodes/compile.el (compilation-error-regexp-alist-alist): 3 * progmodes/compile.el (compilation-error-regexp-alist-alist):
4 For perl, allow "during global destruction" at end. 4 For perl, allow "during global destruction" at end. Add entry for
5 two-arg form of the Test module ok() func.
5 6
62008-01-08 Glenn Morris <rgm@gnu.org> 72008-01-08 Glenn Morris <rgm@gnu.org>
7 8
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]+\\)\\)?"
370 ;; 370 ;;
371 "^# Failed test [0-9]+ in \\([^ \t\r\n]+\\) at line \\([0-9]+\\)" 371 "^# Failed test [0-9]+ in \\([^ \t\r\n]+\\) at line \\([0-9]+\\)"
372 1 2) 372 1 2)
373 (compilation-perl--Test2
374 ;; Or when comparing got/want values,
375 ;; # Test 2 got: "xx" (t-compilation-perl-2.t at line 10)
376 ;;
377 ;; And under Test::Harness they're preceded by progress stuff with
378 ;; \r and "NOK",
379 ;; ... NOK 1# Test 1 got: "1234" (t/foo.t at line 46)
380 ;;
381 "^\\(.*NOK.*\\)?# Test [0-9]+ got:.* (\\([^ \t\r\n]+\\) at line \
382\\([0-9]+\\))"
383 2 3)
373 (compilation-perl--Test::Harness 384 (compilation-perl--Test::Harness
374 ;; perl Test::Harness output, eg. 385 ;; perl Test::Harness output, eg.
375 ;; NOK 1# Test 1 got: "1234" (t/foo.t at line 46) 386 ;; NOK 1# Test 1 got: "1234" (t/foo.t at line 46)