[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.12.1-151-g60a6937

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=60a69375f9802af288ccc82ca4c15b85ce869e28

The branch, master has been updated
       via  60a69375f9802af288ccc82ca4c15b85ce869e28 (commit)
       via  97cee35c19a98f15d39ecd5e711e95d7485d2cb3 (commit)
       via  f0c5b7621906079a039c1693b9ee99cadecf1f97 (commit)
       via  de20404a6d15db5d913de632e2099b864a373546 (commit)
       via  9c906bc7a82aa0cc914c724a7f7fc3518036913c (commit)
       via  a455713ab332e9c426cdcf048d6c248b93122020 (commit)
      from  b21d68690612214d8edd810acf11880c3c0ad586 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 60a69375f9802af288ccc82ca4c15b85ce869e28
Merge: b21d686 97cee35
Author: Stefano Lattarini <address@hidden>
Date:   Thu Jun 28 17:41:27 2012 +0200

    Merge branch 'maint'
    
    * maint:
      tests: one test was not executable, make it so
      readme: fix typo in t/README: s/$((...)/$((...))/
      tests: don't skip if $(abs_builddir) or $(abs_srcdir) contain whitespace
      tests: avoid spurious maintainer-check failures
      tests: remove obsolete hacks around maintainer-check false positives

-----------------------------------------------------------------------

Summary of changes:
 gen-testsuite-part    |    4 ++--
 t/README              |    2 +-
 t/ax/test-init.sh     |   31 ++++---------------------------
 t/test-trs-recover.sh |    5 ++---
 4 files changed, 9 insertions(+), 33 deletions(-)
 mode change 100644 => 100755 t/subdir-order.sh

diff --git a/gen-testsuite-part b/gen-testsuite-part
index 0021362..25da45c 100755
--- a/gen-testsuite-part
+++ b/gen-testsuite-part
@@ -96,7 +96,7 @@ sub write_wrapper_script ($$$)
     for dir in . "\$am_top_srcdir"; do
       if test -f "\$dir/$wrapped_test"; then
         echo "\$0: will source \$dir/$wrapped_test"
-        . "\$dir/$wrapped_test"; exit "\$?"
+        . "\$dir/$wrapped_test"; exit \$?
       fi
     done
     echo "\$0: cannot find wrapped test '$wrapped_test'" >&2
@@ -358,7 +358,7 @@ foreach my $lt (TRUE, FALSE)
               required="@required"
               . ./defs || exit 1
               plan_ $planned
-              . "\$am_testauxdir/depcomp.sh"; exit "\$?"
+              . "\$am_testauxdir/depcomp.sh"; exit \$?
 EOF
           },
           0555);
diff --git a/t/README b/t/README
index a862924..fe86229 100644
--- a/t/README
+++ b/t/README
@@ -268,7 +268,7 @@ Writing test cases
   Bourne-only equivalents:
 
     - use $(...), not `...`, for command substitution;
-    - use $((...), not `expr ...`, for arithmetic processing;
+    - use $((...)), not `expr ...`, for arithmetic processing;
     - liberally use '!' to invert the exit status of a command, e.g.,
       in idioms like "if ! CMD; then ...", instead of relying on clumsy
       paraphrases like "if CMD; then :; else ...".
diff --git a/t/ax/test-init.sh b/t/ax/test-init.sh
index d9f4729..f6d57ef 100644
--- a/t/ax/test-init.sh
+++ b/t/ax/test-init.sh
@@ -591,7 +591,8 @@ fetch_tap_driver ()
   # TODO: we should devise a way to make the shell TAP driver tested also
   # TODO: with /bin/sh, for better coverage.
   case $am_tap_implementation in
-    perl)
+    # Extra quoting required to avoid maintainer-check spurious failures.
+   'perl')
       $PERL -MTAP::Parser -e 1 \
         || skip_all_ "cannot import TAP::Parser perl module"
       sed "1s|#!.*|#! $PERL -w|" "$am_scriptdir"/tap-driver.pl >tap-driver
@@ -822,7 +823,8 @@ do
       fi
       unset priv_check_temp overwrite_status
       ;;
-    perl-threads)
+    # Extra quoting required to avoid maintainer-check spurious failures.
+    'perl-threads')
       if test "$WANT_NO_THREADS" = "yes"; then
         skip_all_ "Devel::Cover cannot cope with threads"
       fi
@@ -900,31 +902,6 @@ do
   esac
 done
 
-# Using just $am_top_builddir for the check here is ok, since the
-# further temporary subdirectory where the test will be run is
-# ensured not to contain any whitespace character.
-case $am_top_builddir in
-  *\ *|*\      *)
-    case " $required " in
-      *' libtool '* | *' libtoolize '* )
-        skip_all_ "libtool has problems with spaces in builddir name";;
-    esac
-    ;;
-esac
-
-# This test is necessary, although Automake's configure script bails out
-# when $srcdir contains spaces.  This is because $am_top_srcdir is in not
-# configure-time $srcdir, but is instead configure-time $abs_srcdir, and
-# that is allowed to contain spaces.
-case $am_top_srcdir in
-  *\ * |*\     *)
-    case " $required " in
-      *' libtool '* | *' libtoolize '* | *' gettext '* )
-        skip_all_ "spaces in srcdir name: libtool/gettext tests won't work";;
-   esac
-   ;;
-esac
-
 # We might need extra macros, e.g., from Libtool or Gettext.
 case " $required " in *\ libtool*) . ./t/libtool-macros.dir/get.sh;; esac
 case " $required " in *\ gettext*) . ./t/gettext-macros.dir/get.sh;; esac
diff --git a/t/subdir-order.sh b/t/subdir-order.sh
old mode 100644
new mode 100755
diff --git a/t/test-trs-recover.sh b/t/test-trs-recover.sh
index 9247b1e..9235a1d 100755
--- a/t/test-trs-recover.sh
+++ b/t/test-trs-recover.sh
@@ -30,9 +30,8 @@ TESTS = foo.test bar.test baz.test
 TEST_LOG_COMPILER = $(SHELL)
 END
 
-# Creative quoting below to please maintainer-check.
-echo exit '$TEST_STATUS' > foo.test
-echo exit '$TEST_STATUS' > bar.test
+echo 'exit $TEST_STATUS' > foo.test
+echo 'exit $TEST_STATUS' > bar.test
 : > baz.test
 
 TEST_STATUS=0; export TEST_STATUS


hooks/post-receive
-- 
GNU Automake