Merge branch 'maint' into testsuite-work

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

diff --git a/ChangeLog b/ChangeLog
index 7306bb0..b75627a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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

diff --git a/tests/missing-tar.test b/tests/missing-tar.test
index 4f531df..889ae20 100755 (executable)
--- a/tests/missing-tar.test
+++ b/tests/missing-tar.test
@@ -142,7 +142,7 @@ $EGREP "(g|gnu)tar" stderr && Exit 1
 rm -f bin/*
 
 # We try to use an option that causes any `tar' program (GNU or non-GNU) to.
-sh -x ./missing --run tar --bad-unknonw-option cvf foo.tar ./data.txt 2>stderr \
+./missing --run tar --bad-unknonw-option cvf foo.tar ./data.txt 2>stderr \
   && { cat stderr >&2; Exit 1; }
 cat stderr >&2
 test ! -f foo.tar