[Automake-commit] [SCM] GNU Automake branch, master, updated. Release-1-10-119-geed7433

[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=eed743342cfa0ff8cc69666243233229e7417f8f

The branch, master has been updated
       via  eed743342cfa0ff8cc69666243233229e7417f8f (commit)
      from  03f753d32b2d6905ef61d9005e1dcaefacdf6124 (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 eed743342cfa0ff8cc69666243233229e7417f8f
Author: Ralf Wildenhues <address@hidden>
Date:   Wed Jan 30 21:23:16 2008 +0100

    Split instsh2.test, so that only the new part requires non-root.
    
    * tests/instsh2.test: Split off testing of `install-sh -C' ...
    * tests/instsh3.test: ... to this new test, requiring non-root.
    * tests/Makefile.am: Adjust.
    * THANKS: Update.
    Report by Theodoros V. Kalamatianos.

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

Summary of changes:
 ChangeLog                             |    8 ++++++++
 THANKS                                |    1 +
 tests/Makefile.am                     |    1 +
 tests/Makefile.in                     |    1 +
 tests/instsh2.test                    |   16 +---------------
 tests/{acloca16.test => instsh3.test} |   33 +++++++++++++++++----------------
 6 files changed, 29 insertions(+), 31 deletions(-)
 copy tests/{acloca16.test => instsh3.test} (59%)

diff --git a/ChangeLog b/ChangeLog
index aa5e7b2..d07b135 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-01-30  Ralf Wildenhues  <address@hidden>
+
+       * tests/instsh2.test: Split off testing of `install-sh -C' ...
+       * tests/instsh3.test: ... to this new test, requiring non-root.
+       * tests/Makefile.am: Adjust.
+       * THANKS: Update.
+       Report by Theodoros V. Kalamatianos.
+
 2008-01-23  Ralf Wildenhues  <address@hidden>
 
        * tests/nobase.test: Extend test to generated files.
diff --git a/THANKS b/THANKS
index f84e625..86e7e36 100644
--- a/THANKS
+++ b/THANKS
@@ -294,6 +294,7 @@ Tamara L. Dahlgren  address@hidden
 Tatu Ylonen            address@hidden
 Teun Burgers           address@hidden
 The Crimson Binome     address@hidden
+Theodoros V. Kalamatianos address@hidden
 Thien-Thi Nguyen       address@hidden
 Thomas Fitzsimmons     address@hidden
 Thomas Gagne           address@hidden
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ec10801..8405c7a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -293,6 +293,7 @@ install2.test \
 installdir.test \
 instsh.test \
 instsh2.test \
+instsh3.test \
 instdat.test \
 instdat2.test \
 instexec.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 6ba81ab..1bcb573 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -442,6 +442,7 @@ install2.test \
 installdir.test \
 instsh.test \
 instsh2.test \
+instsh3.test \
 instdat.test \
 instdat2.test \
 instexec.test \
diff --git a/tests/instsh2.test b/tests/instsh2.test
index 17b61ab..f0b729e 100755
--- a/tests/instsh2.test
+++ b/tests/instsh2.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2004, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004, 2006, 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
@@ -77,20 +77,6 @@ test -f d3/y
 ./install-sh -T x d3 && exit 1
 ./install-sh -T x d4// && exit 1
 
-# Do not change the timestamps when using -C.
-echo foo >file
-./install-sh -C file d1
-TZ=UTC0 touch -t $old_timestamp d1/file
-./install-sh -C file d1
-is_newest file d1/file
-echo foo1 >file
-./install-sh -C file d1
-diff file d1/file
-# Rights must be updated.
-./install-sh -C -m 444 file d1
-test -r d1/file
-test ! -w d1/file
-
 # Ensure that install-sh works with names that include spaces
 touch 'a  b'
 mkdir 'x  y'
diff --git a/tests/acloca16.test b/tests/instsh3.test
similarity index 59%
copy from tests/acloca16.test
copy to tests/instsh3.test
index 7c24df2..95b74c7 100755
--- a/tests/acloca16.test
+++ b/tests/instsh3.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2004  Free Software Foundation, Inc.
+# Copyright (C) 2006, 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,23 +14,24 @@
 # 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 aclocal does not include definitions that are not actually
-# evaluated.
+# More install-sh checks: check -C.
 
+required=non-root
 . ./defs || exit 1
-
 set -e
 
-cat >> configure.in << 'END'
-AC_SUBST([POM])
-END
-
-mkdir m4
-cat >m4/some.m4 <<'EOF'
-AC_DEFUN([AM_SOME_MACRO],
-[AC_DEFUN([AC_SUBST], [GREPME])])
-EOF
+./install-sh -d d1
 
-$ACLOCAL -I m4
-grep m4/some.m4 aclocal.m4 && exit 1
-:
+# Do not change the timestamps when using -C.
+echo foo >file
+./install-sh -C file d1
+TZ=UTC0 touch -t $old_timestamp d1/file
+./install-sh -C file d1
+is_newest file d1/file
+echo foo1 >file
+./install-sh -C file d1
+diff file d1/file
+# Rights must be updated.
+./install-sh -C -m 444 file d1
+test -r d1/file
+test ! -w d1/file


hooks/post-receive
--
GNU Automake