Kevin Ryde <user42 at zip.com.au>:

(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 a31a97d3ced0263390a1ec13df9f8ac9f704ef2a..e0ed590c6fad30e118b75122aeb51fcdb1615f5c 100644 (file)
--- 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 444d3b44e5d170eadd754b8784cef9b59f1d544b..772d35f94f01a1056d87cc1aa5b833a516f5f70e 100644 (file)
--- 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)