[SCM] GNU Automake branch, master, updated. Release-1-10-101-g99d18f4

[Ralf Wildenhues]

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=99d18f4a8b9ab4fc85e823bddb6ed046e36bf4dc

The branch, master has been updated
       via  99d18f4a8b9ab4fc85e823bddb6ed046e36bf4dc (commit)
      from  66931411d01121e7edd5430e7826597473f744ee (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 99d18f4a8b9ab4fc85e823bddb6ed046e36bf4dc
Author: Ralf Wildenhues <address@hidden>
Date:   Thu Jan 10 20:50:02 2008 +0100

    * tests/output-order.test: New test, for the stable output fix.
    * tests/Makefile.am: Update.

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

Summary of changes:
 ChangeLog                                 |    6 +++
 tests/Makefile.am                         |    1 +
 tests/Makefile.in                         |    1 +
 tests/{subpkg3.test => output-order.test} |   53 +++++++++++++----------------
 4 files changed, 32 insertions(+), 29 deletions(-)
 copy tests/{subpkg3.test => output-order.test} (54%)

diff --git a/ChangeLog b/ChangeLog
index 766941a..eef7e2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-11  Bruno Haible  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       * tests/output-order.test: New test, for the stable output fix.
+       * tests/Makefile.am: Update.
+
 2008-01-08  Ralf Wildenhues  <address@hidden>
 
        * Makefile.am (dist-hook): New, ensure world-executable tests.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 80d3d71..db40acc 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -421,6 +421,7 @@ output10.test \
 output11.test \
 output12.test \
 output13.test \
+output-order.test \
 overrid.test \
 parse.test \
 percent.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index dc18bab..ceff3f4 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -570,6 +570,7 @@ output10.test \
 output11.test \
 output12.test \
 output13.test \
+output-order.test \
 overrid.test \
 parse.test \
 percent.test \
diff --git a/tests/subpkg3.test b/tests/output-order.test
similarity index 54%
copy from tests/subpkg3.test
copy to tests/output-order.test
index fd1f90b..e55ef36 100755
--- a/tests/subpkg3.test
+++ b/tests/output-order.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2006  Free Software Foundation, Inc.
+# Copyright (C) 2008  Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -14,44 +14,39 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# make sure different subpackages may share files and directories.
+# Test that `automake -a' output order is stable.
+# From report by Bruno Haible.
 
 . ./defs || exit 1
 
 set -e
 
-cat >Makefile.am <<'END'
-SUBDIRS = subpkg
-EXTRA_DIST = subpkg/foobar
-END
-
 cat >>configure.in <<'END'
-AC_CONFIG_SUBDIRS([subpkg])
 AC_OUTPUT
 END
 
-mkdir subpkg
-
-echo foobar >subpkg/foobar
-
-echo SUBDIRS = >subpkg/Makefile.am
-
-cat >subpkg/configure.in <<'END'
-AC_INIT([subpkg], [1.0])
-AM_INIT_AUTOMAKE
-AC_CONFIG_FILES([Makefile])
-AC_OUTPUT
+: >Makefile.am
+: >AUTHORS
+: >ChangeLog
+: >NEWS
+: >README
+
+cat >.autom4te.cfg <<'END'
+begin-language: "Autoconf"
+args: --no-cache
+end-language: "Autoconf"
+begin-language: "Autoconf-without-aclocal-m4"
+args: --no-cache
+end-language: "Autoconf-without-aclocal-m4"
 END
 
 $ACLOCAL
-$AUTOMAKE
 $AUTOCONF
-
-cd subpkg
-$ACLOCAL
-$AUTOMAKE
-$AUTOCONF
-cd ..
-
-./configure
-$MAKE distcheck
+rm -f missing install-sh
+$AUTOMAKE --add-missing --copy 2>stderr
+cat stderr >&2
+
+for i in 1 2 3 4 5 6; do
+  rm -f missing install-sh INSTALL COPYING
+  $AUTOMAKE --add-missing --copy 2>&1 >/dev/null | diff - stderr
+done


hooks/post-receive
--
GNU Automake