[Emacs-diffs] /srv/bzr/emacs/trunk r104916: * progmodes/compile.el (compilation-error-regexp-alist-alist):

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 104916
author: Kevin Ryde <address@hidden>
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Sun 2011-07-03 23:39:49 +0200
message:
  * progmodes/compile.el (compilation-error-regexp-alist-alist):
  `perl-Test2' extend to match possible "fail #N" rep count
  (bug#8377).
modified:
  etc/ChangeLog
  etc/compilation.txt
  lisp/ChangeLog
  lisp/progmodes/compile.el

=== modified file 'etc/ChangeLog'
--- a/etc/ChangeLog     2011-07-03 01:05:49 +0000
+++ b/etc/ChangeLog     2011-07-03 21:39:49 +0000
@@ -1,3 +1,7 @@
+2011-03-29  Kevin Ryde  <address@hidden>
+
+       * compilation.txt (perl-Test2): New samples.
+
 2011-07-03  Lars Magne Ingebrigtsen  <address@hidden>
 
        * tutorials/TUTORIAL.zh: Remove spurious ")" character on the

=== modified file 'etc/compilation.txt'
--- a/etc/compilation.txt       2011-05-09 01:25:35 +0000
+++ b/etc/compilation.txt       2011-07-03 21:39:49 +0000
@@ -496,6 +496,16 @@
 
 # Failed test 1 in foo.t at line 6
 
+* Perl Test.pm module error messages comparing two values
+
+symbol: perl--Test2
+
+# Test 3 got: "99" (d-compilation-perl.t at line 29)
+#   Expected: "88" (my test name)
+#  d-compilation-perl.t line 29 is: ok(99,88,'my test name');
+
+# Test 6 got: "xx" (foo.t at line 33 fail #2)
+#   Expected: "yy"
 
 * Perl Test::Harness output
 

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-03 20:09:38 +0000
+++ b/lisp/ChangeLog    2011-07-03 21:39:49 +0000
@@ -1,3 +1,9 @@
+2011-03-29  Kevin Ryde  <address@hidden>
+
+       * 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  <address@hidden>
 
        * mail/feedmail.el (feedmail-buffer-to-smtpmail):

=== modified file 'lisp/progmodes/compile.el'
--- a/lisp/progmodes/compile.el 2011-06-21 02:10:10 +0000
+++ b/lisp/progmodes/compile.el 2011-07-03 21:39:49 +0000
@@ -400,15 +400,16 @@
      "^# 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.