[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.12.2-38-g00a297e

[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=00a297e46a719dfb954657c569554db74eedcc64

The branch, maint has been updated
       via  00a297e46a719dfb954657c569554db74eedcc64 (commit)
       via  a237c2cfdb919dad8ba36834ddd1649f670e6630 (commit)
       via  8d88ae22d7599c8617e1c53494860c65e3c1b410 (commit)
       via  eb07a5811b8df9ef3f94fb98adccf0f7d74f8559 (commit)
      from  fd2524171194ab00e7f7cad768bd6753a38ecab9 (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 00a297e46a719dfb954657c569554db74eedcc64
Author: Stefano Lattarini <address@hidden>
Date:   Wed Jul 25 13:16:59 2012 +0200

    test defs: improve a comment
    
    * defs-static.in: Here, about the unsetting of CDPATH.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit a237c2cfdb919dad8ba36834ddd1649f670e6630
Author: Stefano Lattarini <address@hidden>
Date:   Wed Jul 25 13:14:48 2012 +0200

    test defs: remove obsolete comment
    
    * defs-static.in: Here: do not state anymore that this file should execute
    correctly with any system's /bin/sh shell, as this is not true anymore: the
    testsuite assumes a POSIX shell throughout these days.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit 8d88ae22d7599c8617e1c53494860c65e3c1b410
Author: Stefano Lattarini <address@hidden>
Date:   Wed Jul 25 13:03:17 2012 +0200

    runtest: support option --shell, tell which shell should run the test
    
    * runtest.in: Here.  The same effect could have been obtained by
    exporting AM_TEST_RUNNER_SHELL to the desired value, but the new
    API is simpler and requires less typing and less thinking.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

commit eb07a5811b8df9ef3f94fb98adccf0f7d74f8559
Author: Stefano Lattarini <address@hidden>
Date:   Wed Jul 25 12:56:43 2012 +0200

    runtest: support passing options over to the shell
    
    * runtest.in: Here.  Also, support '--help' to display a nice
    help screen.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 defs-static.in |    6 ++----
 runtest.in     |   36 +++++++++++++++++++++++++++++-------
 2 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/defs-static.in b/defs-static.in
index 6901212..bb7ca49 100644
--- a/defs-static.in
+++ b/defs-static.in
@@ -21,11 +21,9 @@
 # IMPORTANT NOTES AND REQUIREMENTS
 #   - Multiple inclusions of this file should be idempotent.
 #   - This code has to be 'set -e' clean.
-#   - This file should execute correctly with any system's /bin/sh
-#     shell, not only with configure-time detected $SHELL and/or
-#     $AM_TEST_RUNNER_SHELL.
 
-# CDPATH is evil if exported in the environment.
+# CDPATH is evil if used in non-interactive scripts (and even more
+# evil if exported in the environment).
 CDPATH=; unset CDPATH
 
 # Be more Bourne compatible.
diff --git a/runtest.in b/runtest.in
index 31f8e01..4bdcb49 100644
--- a/runtest.in
+++ b/runtest.in
@@ -28,12 +28,34 @@ set -e; set -u
 error () { echo "$0: $*" >&2; exit 255; }
 
 # Some shell flags should be passed over to the test scripts.
-#while test $# -gt 0; do
-#  case $1 in
-#    --help) echo "Usage: $0 [SHELL-OPTIONS] TEST [TEST-OPTIONS]"; exit $?;;
-#    -*)
-#  esac
-#done
+shell_opts=
+while test $# -gt 0; do
+  case $1 in
+    --help)
+       echo "Usage: $0 [--shell=PATH] [SHELL-OPTIONS] TEST [TEST-OPTIONS]"
+       exit $?
+       ;;
+    --shell)
+       test $# -gt 1 || error "missing argument for option '$1'"
+       AM_TEST_RUNNER_SHELL=$2
+       shift
+       ;;
+    --shell=*)
+       AM_TEST_RUNNER_SHELL=${1#--shell=}
+       ;;
+    -o)
+       test $# -gt 1 || error "missing argument for option '$1'"
+       shell_opts="-o $2"
+       shift
+       ;;
+    -*)
+       # Assume it is an option to pass through to the shell.
+       shell_opts=$1;;
+     *)
+       break;;
+  esac
+  shift
+done
 
 test $# -gt 0 || error "missing argument"
 
@@ -58,5 +80,5 @@ case $tst in
       ;;
 esac
 
-wrapper "$AM_TEST_RUNNER_SHELL" "$tst" "$@"
+wrapper "$AM_TEST_RUNNER_SHELL" $shell_opts "$tst" "$@"
 error "dead code reached"


hooks/post-receive
-- 
GNU Automake