[Automake-commit] [SCM] GNU Automake branch, test-protocols, updated. v1.11-1068-g027e98e

[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=027e98e68e9f75ea17cb3510491bdfac11e4f806

The branch, test-protocols has been updated
       via  027e98e68e9f75ea17cb3510491bdfac11e4f806 (commit)
       via  cdddf80e02edd43c5cb6a5dc087e724ebadb7854 (commit)
       via  93a1c8a908af2ac955405d622abf6d8711ffb522 (commit)
       via  236ad0bcb351a6e0795a69f272646bd2201b4056 (commit)
       via  a7122ebe28e35ff3d1226ecb2a70520f1bec14bc (commit)
       via  bbddd445708efd8e7a484645f7ebf9b2a3a76102 (commit)
      from  85aa4fee2425be149d54a634f7664d70184c5b41 (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 027e98e68e9f75ea17cb3510491bdfac11e4f806
Author: Stefano Lattarini <address@hidden>
Date:   Mon Aug 29 00:01:54 2011 +0200

    tests: defaults to awk+shell driver in tests on TAP support
    
    * tests/defs ($am_tap_implementation): Default to "shell", not
    to "perl".

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

Summary of changes:
 ChangeLog                       |   19 +++++++++++++++++++
 lib/ylwrap                      |   28 ++++++++++++++--------------
 tests/Makefile.am               |    1 +
 tests/Makefile.in               |    1 +
 tests/defs                      |    2 +-
 tests/java-empty-classpath.test |    4 ++--
 6 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 666445a..0e837a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2011-08-29  Stefano Lattarini  <address@hidden>
+
+       tests: defaults to awk+shell driver in tests on TAP support
+       * tests/defs ($am_tap_implementation): Default to "shell", not
+       to "perl".
+
+2011-08-25  Stefano Lattarini  <address@hidden>
+
+       tests: list "forgotten" test script in TESTS
+       * tests/Makefile.am (TESTS): Also list ...
+       * tests/java-empty-classpath.test: ... this test.  Since we are
+       at it, remove trailing whitespace from a couple of lines.
+
+2011-08-25  Eric Blake  <address@hidden>
+
+       ylwrap: fix unusual indentation whitespace
+       * lib/ylwrap: Convert tabs to spaces.
+       Reported by Karl Berry.
+
 2011-08-26  Stefano Lattarini  <address@hidden>
 
        tests: fix spurious failure for awk implementation of TAP driver
diff --git a/lib/ylwrap b/lib/ylwrap
index 92b2011..9253635 100755
--- a/lib/ylwrap
+++ b/lib/ylwrap
@@ -1,10 +1,10 @@
 #! /bin/sh
 # ylwrap - wrapper for lex/yacc invocations.
 
-scriptversion=2010-02-06.18; # UTC
+scriptversion=2011-08-25.18; # UTC
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
-# 2007, 2009, 2010 Free Software Foundation, Inc.
+# 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
 #
 # Written by Tom Tromey <address@hidden>.
 #
@@ -137,19 +137,19 @@ if test $ret -eq 0; then
     # Handle y_tab.c and y_tab.h output by DOS
     if test $y_tab_nodot = "yes"; then
       if test $from = "y.tab.c"; then
-       from="y_tab.c"
+        from="y_tab.c"
       else
-       if test $from = "y.tab.h"; then
-         from="y_tab.h"
-       fi
+        if test $from = "y.tab.h"; then
+          from="y_tab.h"
+        fi
       fi
     fi
     if test -f "$from"; then
       # If $2 is an absolute path name, then just use that,
       # otherwise prepend `../'.
       case "$2" in
-       [\\/]* | ?:[\\/]*) target="$2";;
-       *) target="../$2";;
+        [\\/]* | ?:[\\/]*) target="$2";;
+        *) target="../$2";;
       esac
 
       # We do not want to overwrite a header file if it hasn't
@@ -159,8 +159,8 @@ if test $ret -eq 0; then
       # Makefile.  Divert the output of all other files to a temporary
       # file so we can compare them to existing versions.
       if test $first = no; then
-       realtarget="$target"
-       target="tmp-`echo $target | sed s/.*[\\/]//g`"
+        realtarget="$target"
+        target="tmp-`echo $target | sed s/.*[\\/]//g`"
       fi
       # Edit out `#line' or `#' directives.
       #
@@ -184,10 +184,10 @@ if test $ret -eq 0; then
 
       # Check whether header files must be updated.
       if test $first = no; then
-       if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
-         echo "$2" is unchanged
-         rm -f "$target"
-       else
+        if test -f "$realtarget" && cmp -s "$realtarget" "$target"; then
+          echo "$2" is unchanged
+          rm -f "$target"
+        else
           echo updating "$2"
           mv -f "$target" "$realtarget"
         fi
diff --git a/tests/Makefile.am b/tests/Makefile.am
index bf0e07d..8e73e5c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -544,6 +544,7 @@ java.test \
 java2.test \
 java3.test \
 java-check.test \
+java-empty-classpath.test \
 javaprim.test \
 javasubst.test \
 java-extra.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index b888c3b..feb3d50 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -803,6 +803,7 @@ java.test \
 java2.test \
 java3.test \
 java-check.test \
+java-empty-classpath.test \
 javaprim.test \
 javasubst.test \
 java-extra.test \
diff --git a/tests/defs b/tests/defs
index 4d21a49..5f7a0a1 100644
--- a/tests/defs
+++ b/tests/defs
@@ -329,7 +329,7 @@ fetch_tap_driver ()
 }
 # The shell/awk implementation of the TAP driver is still mostly dummy, so
 # use the perl implementation by default for the moment.
-am_tap_implementation=${am_tap_implementation-perl}
+am_tap_implementation=${am_tap_implementation-shell}
 
 ## ----------------------------------------------------------- ##
 ##  Checks for required tools, and additional setups (if any)  ##
diff --git a/tests/java-empty-classpath.test b/tests/java-empty-classpath.test
index 230bb7c..e94f885 100755
--- a/tests/java-empty-classpath.test
+++ b/tests/java-empty-classpath.test
@@ -37,8 +37,8 @@ cat > Makefile.am <<END
 CLEANFILES = *.class
 SUBDIRS = org
 END
-echo SUBDIRS = gnu > org/Makefile.am 
-echo SUBDIRS = bug > org/gnu/Makefile.am 
+echo SUBDIRS = gnu > org/Makefile.am
+echo SUBDIRS = bug > org/gnu/Makefile.am
 cat > org/gnu/bug/Makefile.am <<'END'
 JAVAROOT = ../../..
 dist_noinst_JAVA = Library.java Application.java


hooks/post-receive
-- 
GNU Automake