Merge branch 'maint' into testsuite-work

* maint:
  tests: fix failure due to debugging code forgotten into a test

diff --cc ChangeLog
index 7306bb0c62f51f02f96225946a6d22fb1def939d,cb03a8d351b0ea0e0c35f40b58673d78bef734d7..b75627a6dfe2e8a3e6afba94a6defb9aaf4eb528
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,11 +1,19 @@@
+ 2011-12-22  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       tests: fix failure due to debugging code forgotten into a test
+       * tests/missing-tar.test: Don't ever call the `missing' script
+       with `sh -x'; this was used for debugging, but an instance of
+       it slipped into the committed test case.  Bug revealed by a
+       failure on a Solaris 10 system with GNU tar installed as `gtar'.
+ 
 +2011-12-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      Merge branch 'master' into testsuite-work
 +      * tests/gettext-macros.test: In the generated `get.sh' file,
 +      use `skip_all_', not `skip_'.
 +      * tests/libtool-macros.test: Likewise.
 +      * tests/list-of-tests.mk: Update.
 +
  2011-12-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        tests: avoid spurious failure of libtool and gettext tests