aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorBill Wohler2011-07-03 19:58:14 -0700
committerBill Wohler2011-07-03 19:58:14 -0700
commit3ca74e5368a1022e332a0601d9be2418dbe8c083 (patch)
treea4bb4d280cb6758e8e2dec263e1ea261e90fa924 /etc
parent92ec073e6441e7abfdc49c7734a880fecdf2d1f3 (diff)
parenta555cb879988c74b28cb0aa1e9cd1b19f5df6980 (diff)
downloademacs-3ca74e5368a1022e332a0601d9be2418dbe8c083.tar.gz
emacs-3ca74e5368a1022e332a0601d9be2418dbe8c083.zip
Merge from trunk.
Diffstat (limited to 'etc')
-rw-r--r--etc/ChangeLog4
-rw-r--r--etc/compilation.txt10
2 files changed, 14 insertions, 0 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog
index cbc267f71ba..ea3ef2767a9 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
12011-03-29 Kevin Ryde <user42@zip.com.au>
2
3 * compilation.txt (perl-Test2): New samples.
4
12011-07-03 Lars Magne Ingebrigtsen <larsi@gnus.org> 52011-07-03 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 6
3 * tutorials/TUTORIAL.zh: Remove spurious ")" character on the 7 * 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
496 496
497# Failed test 1 in foo.t at line 6 497# Failed test 1 in foo.t at line 6
498 498
499* Perl Test.pm module error messages comparing two values
500
501symbol: perl--Test2
502
503# Test 3 got: "99" (d-compilation-perl.t at line 29)
504# Expected: "88" (my test name)
505# d-compilation-perl.t line 29 is: ok(99,88,'my test name');
506
507# Test 6 got: "xx" (foo.t at line 33 fail #2)
508# Expected: "yy"
499 509
500* Perl Test::Harness output 510* Perl Test::Harness output
501 511