diff options
| -rw-r--r-- | etc/ChangeLog | 4 | ||||
| -rw-r--r-- | etc/compilation.txt | 10 | ||||
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/progmodes/compile.el | 5 |
4 files changed, 23 insertions, 2 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog index cbc267f71ba..ea3ef2767a9 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,7 @@ +2011-03-29 Kevin Ryde <user42@zip.com.au> + + * compilation.txt (perl-Test2): New samples. + 2011-07-03 Lars Magne Ingebrigtsen <larsi@gnus.org> * tutorials/TUTORIAL.zh: Remove spurious ")" character on the diff --git a/etc/compilation.txt b/etc/compilation.txt index 8e19222143a..0eb3fe1bda2 100644 --- a/etc/compilation.txt +++ b/etc/compilation.txt @@ -496,6 +496,16 @@ symbol: perl--Test # 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 diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 481000f8851..fa46ab7850e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2011-03-29 Kevin Ryde <user42@zip.com.au> + + * 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 <larsi@gnus.org> * mail/feedmail.el (feedmail-buffer-to-smtpmail): diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 1a23cd112af..0b9390af6c9 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -400,15 +400,16 @@ File = \\(.+\\), Line = \\([0-9]+\\)\\(?:, Column = \\([0-9]+\\)\\)?" "^# 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. |