Merge branch 'maint'

* maint:
  tests: relax a test on amhello examples to cater to Solaris tar

diff --cc ChangeLog
index 0aedd52ab8af56e037e7829bd0f2bfa2a8ea7895,63ae2200f71a1a2b5ad2e8c2946e21d617141d93..4e7e08a8743ab1e1e51c0956d201a10e7a816fcf
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,14 +1,23 @@@
+ 2011-07-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       tests: relax a test on amhello examples to cater to Solaris tar
+       * tests/amhello-binpkg.test: When the tar implementation in use
+       is not GNU tar, relax the tests on tar output, to avoid spurious
+       failures.  For example, "tar cvf ..." with GNU tar can output
+       lines like "./usr/bin/hello" on the standard output, while with
+       Solaris tar it can output lines like "a ./usr/bin/hello 8K" on
+       standard output, and with Heirloom tar it can output lines like
+       "a ./usr/bin/hello 15 tape blocks" on standard error.
+ 
 +2011-07-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      test defs: function 'is_newest' now works also with directories
 +      * tests/defs (is_newest): Call `find' with the `-prune' option,
 +      so that it won't descend in the directories (which could cause
 +      spurious results).
 +      * tests/self-check-is_newest: Extend accordingly.
 +      From a report by Jim Meyering, see automake bug#9147.
 +
  2011-07-15  Benoit Sigoure  <tsunanet@gmail.com>
  
        docs: add references between the 2 sections on java support