[Automake-commit] [SCM] GNU Automake branch, tests-init, updated. v1.11-425-g206f3bf

[Peter Rosin]

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=206f3bf19c4384591b50888bf0d4859ae985ca6b

The branch, tests-init has been updated
       via  206f3bf19c4384591b50888bf0d4859ae985ca6b (commit)
       via  38846c5f1cb8ad3745bc9a37816fb1cb7d75b399 (commit)
       via  f4610768555fa588dd2d25e77651dd3a22540108 (commit)
       via  d164eb55a41ec2fc48b402b276749f4b7d72dc91 (commit)
       via  89bf665808e6ed7a68957342e6343cf3261ebf14 (commit)
      from  f3a5d05517c8f60cc515c835cc15cd86e2b39abd (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 ChangeLog           |   15 +++++++++++++++
 lib/compile         |    5 +++--
 tests/ar-lib.test   |    1 +
 tests/compile3.test |    5 +++++
 tests/compile6.test |    1 +
 tests/defs          |    9 +++++++++
 6 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 634a3ed..7596418 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2010-11-16  Peter Rosin  <address@hidden>
+
+       Skip MSVC oriented tests if the shell is not capable.
+       * tests/defs: New required entry 'xsi-shell'.
+       * tests/ar-lib.test, tests/compile3.test, tests/compile6.test:
+       Require a XSI capable shell.
+       Reported by Ralf Wildenhues.
+
+2010-11-15  Peter Rosin  <address@hidden>
+
+       compile: clear the `eat' variable earlier.
+       * lib/compile: Clear the `eat' variable earlier.
+       ($scriptversion): Update.
+       * tests/compile3.test: Prevent regressions.
+
 2010-11-11  Stefano Lattarini  <address@hidden>
 
        Tests defs: improve messages for skipped tests.
diff --git a/lib/compile b/lib/compile
index 46caccc..bac481c 100755
--- a/lib/compile
+++ b/lib/compile
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand `-c -o'.
 
-scriptversion=2010-09-21.14; # UTC
+scriptversion=2010-11-15.09; # UTC
 
 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010 Free Software
 # Foundation, Inc.
@@ -192,6 +192,8 @@ func_cl_wrapper ()
   exit 1
 }
 
+eat=
+
 case $1 in
   '')
      echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
@@ -223,7 +225,6 @@ esac
 
 ofile=
 cfile=
-eat=
 
 for arg
 do
diff --git a/tests/ar-lib.test b/tests/ar-lib.test
index c788778..652aaf1 100755
--- a/tests/ar-lib.test
+++ b/tests/ar-lib.test
@@ -16,6 +16,7 @@
 
 # Make sure `ar-lib' wraps the Microsoft Library Manager (lib) correctly
 
+required=xsi-shell
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/compile3.test b/tests/compile3.test
index d8c7d3b..53db926 100755
--- a/tests/compile3.test
+++ b/tests/compile3.test
@@ -16,6 +16,7 @@
 
 # Make sure `compile' wraps the Microsoft C/C++ compiler (cl) correctly
 
+required=xsi-shell
 . ./defs || Exit 1
 
 set -e
@@ -46,4 +47,8 @@ test x"$opts" = x"-c foo.c -Fofoo.o -Ibaz"
 opts=`./compile ./cl -c foo.cc -o foo.o -Ibaz`
 test x"$opts" = x"-c -Tpfoo.cc -Fofoo.o -Ibaz"
 
+# Check if compile clears the "eat" variable properly.
+opts=`eat=1 ./compile ./cl -c foo.c -o foo.obj -Ibaz`
+test x"$opts" = x"-c foo.c -Fofoo.obj -Ibaz"
+
 :
diff --git a/tests/compile6.test b/tests/compile6.test
index 0f09e84..f45a534 100755
--- a/tests/compile6.test
+++ b/tests/compile6.test
@@ -16,6 +16,7 @@
 
 # Make sure `compile' searches libraries correctly
 
+required=xsi-shell
 . ./defs || Exit 1
 
 set -e
diff --git a/tests/defs b/tests/defs
index 82c3b5b..8f748b1 100644
--- a/tests/defs
+++ b/tests/defs
@@ -290,6 +290,15 @@ do
       echo "$me: running texi2dvi -o /dev/null --version"
       ( texi2dvi -o /dev/null --version ) || exit 77
       ;;
+    xsi-shell)
+      # Try some XSI features.
+      echo "$me: trying some XSI constructs"
+      ( _am_dummy="a/b/c"
+       test 
"${_am_dummy##*/},${_am_dummy%/*},${_am_dummy#??}"${_am_dummy%"$_am_dummy"}, \
+               = c,a/b,b/c, \
+       && eval 'test $(( 1 + 1 )) -eq 2 \
+       && test "${#_am_dummy}" -eq 5' ) || exit 77
+      ;;
     *)
       # Generic case: the tool must support --version.
       echo "$me: running $tool --version"


hooks/post-receive
-- 
GNU Automake